All upgrades are used in calculations -> bomb still has to be balanced
added firework on goal and different goal screen (with button to toolshop), but not happy with second one Have to change it in layout file TopBarData has been removed -> All data (DataStorageHandler, TutorialManager, LevelManager, SoundManager, Typeface, User) is stored in the GameActivity and can be recieved by getters Toolshop-tutorial can now be reset and works instantaniously
This commit is contained in:
@ -13,33 +13,51 @@
|
||||
android:textSize="55sp"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/message_nextlevelbutton"
|
||||
style="@style/GameButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Restart"
|
||||
android:id="@+id/message_leftbutton"
|
||||
style="@style/GameButton"
|
||||
android:layout_marginTop="37dp"
|
||||
android:layout_below="@+id/message_title"
|
||||
android:layout_alignStart="@+id/message_title"/>
|
||||
android:layout_toLeftOf="@+id/message_title"
|
||||
android:layout_toStartOf="@+id/message_title"
|
||||
android:text="Next level"/>
|
||||
|
||||
<Button
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Exit"
|
||||
style="@style/GameButton"
|
||||
android:id="@+id/message_exitbutton"
|
||||
android:layout_alignTop="@+id/message_leftbutton"
|
||||
android:layout_alignEnd="@+id/message_title"/>
|
||||
|
||||
<Button
|
||||
style="@style/GameButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Try again"
|
||||
android:text="To menu"
|
||||
android:layout_alignBaseline="@+id/message_restartbutton"
|
||||
android:layout_alignBottom="@+id/message_restartbutton"
|
||||
android:layout_alignLeft="@+id/message_toolshopbutton"
|
||||
android:layout_alignStart="@+id/message_toolshopbutton"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/message_toolshopbutton"
|
||||
style="@style/GameButton"
|
||||
android:id="@+id/message_tryagainbutton"
|
||||
android:visibility="visible"
|
||||
android:layout_marginTop="3dp"
|
||||
android:layout_below="@+id/message_leftbutton"
|
||||
android:layout_alignStart="@+id/message_leftbutton"/>
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="21dp"
|
||||
android:layout_marginStart="21dp"
|
||||
android:text="Tools"
|
||||
android:layout_above="@+id/message_title"
|
||||
android:layout_toRightOf="@+id/message_title"
|
||||
android:layout_toEndOf="@+id/message_title"
|
||||
android:layout_marginBottom="14dp"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/message_restartbutton"
|
||||
style="@style/GameButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignLeft="@+id/message_title"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_alignStart="@+id/message_title"
|
||||
android:layout_marginBottom="14dp"
|
||||
android:layout_marginLeft="50dp"
|
||||
android:layout_marginStart="50dp"
|
||||
android:text="Restart level"
|
||||
android:visibility="visible"/>
|
||||
|
||||
</RelativeLayout>
|
@ -25,9 +25,9 @@
|
||||
android:background="@drawable/playershapes_ball"
|
||||
android:text="Play"
|
||||
android:textSize="25sp"
|
||||
android:textColor="#ffffff"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_centerHorizontal="true"/>
|
||||
android:layout_centerHorizontal="true"
|
||||
android:textColor="#ffffff"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/startscreen_comingsoon"
|
||||
|
@ -58,7 +58,7 @@
|
||||
<style name="Base.Theme.AppCompat.Light" parent="Base.V21.Theme.AppCompat.Light"/>
|
||||
<style name="Base.Theme.AppCompat.Light.Dialog" parent="Base.V21.Theme.AppCompat.Light.Dialog"/>
|
||||
<style name="Base.V21.Theme.AppCompat" parent="Base.V7.Theme.AppCompat">
|
||||
|
||||
<!-- Action Bar styling attributes -->
|
||||
<item name="actionBarSize">?android:attr/actionBarSize</item>
|
||||
<item name="actionBarDivider">?android:attr/actionBarDivider</item>
|
||||
<item name="actionBarItemBackground">@drawable/abc_action_bar_item_background_material</item>
|
||||
@ -68,12 +68,12 @@
|
||||
<item name="actionOverflowButtonStyle">?android:attr/actionOverflowButtonStyle</item>
|
||||
<item name="homeAsUpIndicator">?android:attr/homeAsUpIndicator</item>
|
||||
|
||||
|
||||
<!-- For PopupMenu -->
|
||||
<item name="listPreferredItemHeightSmall">?android:attr/listPreferredItemHeightSmall</item>
|
||||
<item name="textAppearanceLargePopupMenu">?android:attr/textAppearanceLargePopupMenu</item>
|
||||
<item name="textAppearanceSmallPopupMenu">?android:attr/textAppearanceSmallPopupMenu</item>
|
||||
|
||||
|
||||
<!-- General view attributes -->
|
||||
<item name="selectableItemBackground">?android:attr/selectableItemBackground</item>
|
||||
<item name="selectableItemBackgroundBorderless">?android:attr/selectableItemBackgroundBorderless</item>
|
||||
<item name="borderlessButtonStyle">?android:borderlessButtonStyle</item>
|
||||
@ -83,7 +83,7 @@
|
||||
<item name="editTextColor">?android:attr/editTextColor</item>
|
||||
<item name="listChoiceBackgroundIndicator">?android:attr/listChoiceBackgroundIndicator</item>
|
||||
|
||||
|
||||
<!-- Copy the platform default styles for the AppCompat widgets -->
|
||||
<item name="buttonStyle">?android:attr/buttonStyle</item>
|
||||
<item name="buttonStyleSmall">?android:attr/buttonStyleSmall</item>
|
||||
<item name="checkboxStyle">?android:attr/checkboxStyle</item>
|
||||
@ -92,7 +92,7 @@
|
||||
<item name="ratingBarStyle">?android:attr/ratingBarStyle</item>
|
||||
<item name="spinnerStyle">?android:attr/spinnerStyle</item>
|
||||
|
||||
|
||||
<!-- Copy our color theme attributes to the framework -->
|
||||
<item name="android:colorPrimary">?attr/colorPrimary</item>
|
||||
<item name="android:colorPrimaryDark">?attr/colorPrimaryDark</item>
|
||||
<item name="android:colorAccent">?attr/colorAccent</item>
|
||||
@ -105,7 +105,7 @@
|
||||
<item name="android:windowElevation">@dimen/abc_floating_window_z</item>
|
||||
</style>
|
||||
<style name="Base.V21.Theme.AppCompat.Light" parent="Base.V7.Theme.AppCompat.Light">
|
||||
|
||||
<!-- Action Bar styling attributes -->
|
||||
<item name="actionBarSize">?android:attr/actionBarSize</item>
|
||||
<item name="actionBarDivider">?android:attr/actionBarDivider</item>
|
||||
<item name="actionBarItemBackground">@drawable/abc_action_bar_item_background_material</item>
|
||||
@ -115,12 +115,12 @@
|
||||
<item name="actionOverflowButtonStyle">?android:attr/actionOverflowButtonStyle</item>
|
||||
<item name="homeAsUpIndicator">?android:attr/homeAsUpIndicator</item>
|
||||
|
||||
|
||||
<!-- For PopupMenu -->
|
||||
<item name="listPreferredItemHeightSmall">?android:attr/listPreferredItemHeightSmall</item>
|
||||
<item name="textAppearanceLargePopupMenu">?android:attr/textAppearanceLargePopupMenu</item>
|
||||
<item name="textAppearanceSmallPopupMenu">?android:attr/textAppearanceSmallPopupMenu</item>
|
||||
|
||||
|
||||
<!-- General view attributes -->
|
||||
<item name="selectableItemBackground">?android:attr/selectableItemBackground</item>
|
||||
<item name="selectableItemBackgroundBorderless">?android:attr/selectableItemBackgroundBorderless</item>
|
||||
<item name="borderlessButtonStyle">?android:borderlessButtonStyle</item>
|
||||
@ -130,7 +130,7 @@
|
||||
<item name="editTextColor">?android:attr/editTextColor</item>
|
||||
<item name="listChoiceBackgroundIndicator">?android:attr/listChoiceBackgroundIndicator</item>
|
||||
|
||||
|
||||
<!-- Copy the platform default styles for the AppCompat widgets -->
|
||||
<item name="buttonStyle">?android:attr/buttonStyle</item>
|
||||
<item name="buttonStyleSmall">?android:attr/buttonStyleSmall</item>
|
||||
<item name="checkboxStyle">?android:attr/checkboxStyle</item>
|
||||
@ -139,7 +139,7 @@
|
||||
<item name="ratingBarStyle">?android:attr/ratingBarStyle</item>
|
||||
<item name="spinnerStyle">?android:attr/spinnerStyle</item>
|
||||
|
||||
|
||||
<!-- Copy our color theme attributes to the framework -->
|
||||
<item name="android:colorPrimary">?attr/colorPrimary</item>
|
||||
<item name="android:colorPrimaryDark">?attr/colorPrimaryDark</item>
|
||||
<item name="android:colorAccent">?attr/colorAccent</item>
|
||||
@ -225,7 +225,7 @@
|
||||
<item name="android:buttonBarButtonStyle">?attr/buttonBarButtonStyle</item>
|
||||
</style>
|
||||
<style name="Platform.ThemeOverlay.AppCompat" parent="">
|
||||
|
||||
<!-- Copy our color theme attributes to the framework -->
|
||||
<item name="android:colorPrimary">?attr/colorPrimary</item>
|
||||
<item name="android:colorPrimaryDark">?attr/colorPrimaryDark</item>
|
||||
<item name="android:colorAccent">?attr/colorAccent</item>
|
||||
|
@ -81,6 +81,7 @@
|
||||
<color name="toolbuttonInactiveReady">#dbfff200</color>
|
||||
<color name="toolbuttonLocked">#db494b49</color>
|
||||
<color name="toolslotDisabled">#715f5f</color>
|
||||
<color name="toolslotDisabledSelected">#60715f</color>
|
||||
<color name="toolslotEnabled">#db41e42b</color>
|
||||
<color name="toolslotEnabledSelected">#b3d700</color>
|
||||
<color name="win">#ffda45</color>
|
||||
@ -438,7 +439,7 @@
|
||||
<item name="actionBarWidgetTheme">@null</item>
|
||||
<item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
|
||||
|
||||
|
||||
<!-- Panel attributes -->
|
||||
<item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_dark</item>
|
||||
|
||||
<item name="colorPrimaryDark">@color/primary_dark_material_dark</item>
|
||||
@ -488,7 +489,7 @@
|
||||
<item name="colorButtonNormal">@color/button_material_dark</item>
|
||||
<item name="colorSwitchThumbNormal">@color/switch_thumb_material_dark</item>
|
||||
|
||||
|
||||
<!-- Used by MediaRouter -->
|
||||
<item name="isLightTheme">false</item>
|
||||
</style>
|
||||
<style name="Base.ThemeOverlay.AppCompat.Dark.ActionBar">
|
||||
@ -519,7 +520,7 @@
|
||||
<item name="colorButtonNormal">@color/button_material_light</item>
|
||||
<item name="colorSwitchThumbNormal">@color/switch_thumb_material_light</item>
|
||||
|
||||
|
||||
<!-- Used by MediaRouter -->
|
||||
<item name="isLightTheme">true</item>
|
||||
</style>
|
||||
<style name="Base.V7.Theme.AppCompat" parent="Platform.AppCompat">
|
||||
@ -529,7 +530,7 @@
|
||||
<item name="windowActionModeOverlay">false</item>
|
||||
<item name="actionBarPopupTheme">@null</item>
|
||||
|
||||
|
||||
<!-- Used by MediaRouter -->
|
||||
<item name="isLightTheme">false</item>
|
||||
|
||||
<item name="selectableItemBackground">@drawable/abc_item_background_holo_dark</item>
|
||||
@ -540,7 +541,7 @@
|
||||
<item name="dividerVertical">@drawable/abc_list_divider_mtrl_alpha</item>
|
||||
<item name="dividerHorizontal">@drawable/abc_list_divider_mtrl_alpha</item>
|
||||
|
||||
|
||||
<!-- Action Bar Styles -->
|
||||
<item name="actionBarTabStyle">@style/Widget.AppCompat.ActionBar.TabView</item>
|
||||
<item name="actionBarTabBarStyle">@style/Widget.AppCompat.ActionBar.TabBar</item>
|
||||
<item name="actionBarTabTextStyle">@style/Widget.AppCompat.ActionBar.TabText</item>
|
||||
@ -557,10 +558,10 @@
|
||||
<item name="actionMenuTextAppearance">@style/TextAppearance.AppCompat.Widget.ActionBar.Menu</item>
|
||||
<item name="actionMenuTextColor">?android:attr/textColorPrimaryDisableOnly</item>
|
||||
|
||||
|
||||
<!-- Dropdown Spinner Attributes -->
|
||||
<item name="actionDropDownStyle">@style/Widget.AppCompat.Spinner.DropDown.ActionBar</item>
|
||||
|
||||
|
||||
<!-- Action Mode -->
|
||||
<item name="actionModeStyle">@style/Widget.AppCompat.ActionMode</item>
|
||||
<item name="actionModeBackground">@drawable/abc_cab_background_top_material</item>
|
||||
<item name="actionModeSplitBackground">?attr/colorPrimaryDark</item>
|
||||
@ -573,14 +574,14 @@
|
||||
<item name="actionModeSelectAllDrawable">@drawable/abc_ic_menu_selectall_mtrl_alpha</item>
|
||||
<item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_mtrl_alpha</item>
|
||||
|
||||
|
||||
<!-- Panel attributes -->
|
||||
<item name="panelMenuListWidth">@dimen/abc_panel_menu_list_width</item>
|
||||
<item name="panelMenuListTheme">@style/Theme.AppCompat.CompactMenu</item>
|
||||
<item name="panelBackground">@drawable/abc_menu_hardkey_panel_mtrl_mult</item>
|
||||
<item name="android:panelBackground">@android:color/transparent</item>
|
||||
<item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_dark</item>
|
||||
|
||||
|
||||
<!-- List attributes -->
|
||||
<item name="textAppearanceListItem">@style/TextAppearance.AppCompat.Subhead</item>
|
||||
<item name="textAppearanceListItemSmall">@style/TextAppearance.AppCompat.Subhead</item>
|
||||
<item name="listPreferredItemHeight">64dp</item>
|
||||
@ -589,33 +590,33 @@
|
||||
<item name="listPreferredItemPaddingLeft">@dimen/abc_list_item_padding_horizontal_material</item>
|
||||
<item name="listPreferredItemPaddingRight">@dimen/abc_list_item_padding_horizontal_material</item>
|
||||
|
||||
|
||||
<!-- Spinner styles -->
|
||||
<item name="spinnerStyle">@style/Widget.AppCompat.Spinner</item>
|
||||
<item name="android:spinnerItemStyle">@style/Widget.AppCompat.TextView.SpinnerItem</item>
|
||||
<item name="android:dropDownListViewStyle">@style/Widget.AppCompat.ListView.DropDown</item>
|
||||
|
||||
|
||||
<!-- Required for use of support_simple_spinner_dropdown_item.xml -->
|
||||
<item name="spinnerDropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item>
|
||||
<item name="dropdownListPreferredItemHeight">?attr/listPreferredItemHeightSmall</item>
|
||||
|
||||
|
||||
<!-- Popup Menu styles -->
|
||||
<item name="popupMenuStyle">@style/Widget.AppCompat.PopupMenu</item>
|
||||
<item name="textAppearanceLargePopupMenu">@style/TextAppearance.AppCompat.Widget.PopupMenu.Large</item>
|
||||
<item name="textAppearanceSmallPopupMenu">@style/TextAppearance.AppCompat.Widget.PopupMenu.Small</item>
|
||||
<item name="listPopupWindowStyle">@style/Widget.AppCompat.ListPopupWindow</item>
|
||||
<item name="dropDownListViewStyle">?android:attr/dropDownListViewStyle</item>
|
||||
|
||||
|
||||
<!-- SearchView attributes -->
|
||||
<item name="searchViewStyle">@style/Widget.AppCompat.SearchView</item>
|
||||
<item name="android:dropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item>
|
||||
<item name="textColorSearchUrl">@color/abc_search_url_text</item>
|
||||
<item name="textAppearanceSearchResultTitle">@style/TextAppearance.AppCompat.SearchResult.Title</item>
|
||||
<item name="textAppearanceSearchResultSubtitle">@style/TextAppearance.AppCompat.SearchResult.Subtitle</item>
|
||||
|
||||
|
||||
<!-- ShareActionProvider attributes -->
|
||||
<item name="activityChooserViewStyle">@style/Widget.AppCompat.ActivityChooserView</item>
|
||||
|
||||
|
||||
<!-- Toolbar styles -->
|
||||
<item name="toolbarStyle">@style/Widget.AppCompat.Toolbar</item>
|
||||
<item name="toolbarNavigationButtonStyle">@style/Widget.AppCompat.Toolbar.Button.Navigation</item>
|
||||
|
||||
@ -624,7 +625,7 @@
|
||||
<item name="editTextColor">?android:attr/textColorPrimary</item>
|
||||
<item name="autoCompleteTextViewStyle">@style/Widget.AppCompat.AutoCompleteTextView</item>
|
||||
|
||||
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimaryDark">@color/primary_dark_material_dark</item>
|
||||
<item name="colorPrimary">@color/primary_material_dark</item>
|
||||
<item name="colorAccent">@color/accent_material_dark</item>
|
||||
@ -645,7 +646,7 @@
|
||||
<item name="ratingBarStyle">@style/Widget.AppCompat.RatingBar</item>
|
||||
<item name="seekBarStyle">@style/Widget.AppCompat.SeekBar</item>
|
||||
|
||||
|
||||
<!-- Button styles -->
|
||||
<item name="buttonStyle">@style/Widget.AppCompat.Button</item>
|
||||
<item name="buttonStyleSmall">@style/Widget.AppCompat.Button.Small</item>
|
||||
<item name="android:textAppearanceButton">@style/TextAppearance.AppCompat.Widget.Button</item>
|
||||
@ -658,7 +659,7 @@
|
||||
<item name="buttonBarNegativeButtonStyle">?attr/buttonBarButtonStyle</item>
|
||||
<item name="buttonBarNeutralButtonStyle">?attr/buttonBarButtonStyle</item>
|
||||
|
||||
|
||||
<!-- Dialog attributes -->
|
||||
<item name="dialogTheme">@style/Theme.AppCompat.Dialog</item>
|
||||
<item name="dialogPreferredPadding">@dimen/abc_dialog_padding_material</item>
|
||||
|
||||
@ -668,7 +669,8 @@
|
||||
<item name="textColorAlertDialogListItem">@color/abc_primary_text_material_dark</item>
|
||||
<item name="listDividerAlertDialog">@null</item>
|
||||
|
||||
|
||||
<!-- Define these here; ContextThemeWrappers around themes that define them should
|
||||
always clear these values. -->
|
||||
<item name="windowFixedWidthMajor">0dp</item>
|
||||
<item name="windowFixedWidthMinor">0dp</item>
|
||||
<item name="windowFixedHeightMajor">0dp</item>
|
||||
@ -703,7 +705,7 @@
|
||||
<item name="windowActionModeOverlay">false</item>
|
||||
<item name="actionBarPopupTheme">@null</item>
|
||||
|
||||
|
||||
<!-- Used by MediaRouter -->
|
||||
<item name="isLightTheme">true</item>
|
||||
|
||||
<item name="selectableItemBackground">@drawable/abc_item_background_holo_light</item>
|
||||
@ -714,7 +716,7 @@
|
||||
<item name="dividerVertical">@drawable/abc_list_divider_mtrl_alpha</item>
|
||||
<item name="dividerHorizontal">@drawable/abc_list_divider_mtrl_alpha</item>
|
||||
|
||||
|
||||
<!-- Action Bar Styles -->
|
||||
<item name="actionBarTabStyle">@style/Widget.AppCompat.Light.ActionBar.TabView</item>
|
||||
<item name="actionBarTabBarStyle">@style/Widget.AppCompat.Light.ActionBar.TabBar</item>
|
||||
<item name="actionBarTabTextStyle">@style/Widget.AppCompat.Light.ActionBar.TabText</item>
|
||||
@ -731,7 +733,7 @@
|
||||
<item name="actionMenuTextAppearance">@style/TextAppearance.AppCompat.Widget.ActionBar.Menu</item>
|
||||
<item name="actionMenuTextColor">?android:attr/textColorPrimaryDisableOnly</item>
|
||||
|
||||
|
||||
<!-- Action Mode -->
|
||||
<item name="actionModeStyle">@style/Widget.AppCompat.ActionMode</item>
|
||||
<item name="actionModeBackground">@drawable/abc_cab_background_top_material</item>
|
||||
<item name="actionModeSplitBackground">?attr/colorPrimaryDark</item>
|
||||
@ -744,17 +746,17 @@
|
||||
<item name="actionModeSelectAllDrawable">@drawable/abc_ic_menu_selectall_mtrl_alpha</item>
|
||||
<item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_mtrl_alpha</item>
|
||||
|
||||
|
||||
<!-- Dropdown Spinner Attributes -->
|
||||
<item name="actionDropDownStyle">@style/Widget.AppCompat.Light.Spinner.DropDown.ActionBar</item>
|
||||
|
||||
|
||||
<!-- Panel attributes -->
|
||||
<item name="panelMenuListWidth">@dimen/abc_panel_menu_list_width</item>
|
||||
<item name="panelMenuListTheme">@style/Theme.AppCompat.CompactMenu</item>
|
||||
<item name="panelBackground">@drawable/abc_menu_hardkey_panel_mtrl_mult</item>
|
||||
<item name="android:panelBackground">@android:color/transparent</item>
|
||||
<item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_light</item>
|
||||
|
||||
|
||||
<!-- List attributes -->
|
||||
<item name="textAppearanceListItem">@style/TextAppearance.AppCompat.Subhead</item>
|
||||
<item name="textAppearanceListItemSmall">@style/TextAppearance.AppCompat.Subhead</item>
|
||||
<item name="listPreferredItemHeight">64dp</item>
|
||||
@ -763,33 +765,33 @@
|
||||
<item name="listPreferredItemPaddingLeft">@dimen/abc_list_item_padding_horizontal_material</item>
|
||||
<item name="listPreferredItemPaddingRight">@dimen/abc_list_item_padding_horizontal_material</item>
|
||||
|
||||
|
||||
<!-- Spinner styles -->
|
||||
<item name="spinnerStyle">@style/Widget.AppCompat.Spinner</item>
|
||||
<item name="android:spinnerItemStyle">@style/Widget.AppCompat.TextView.SpinnerItem</item>
|
||||
<item name="android:dropDownListViewStyle">@style/Widget.AppCompat.ListView.DropDown</item>
|
||||
|
||||
|
||||
<!-- Required for use of support_simple_spinner_dropdown_item.xml -->
|
||||
<item name="spinnerDropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item>
|
||||
<item name="dropdownListPreferredItemHeight">?attr/listPreferredItemHeightSmall</item>
|
||||
|
||||
|
||||
<!-- Popup Menu styles -->
|
||||
<item name="popupMenuStyle">@style/Widget.AppCompat.Light.PopupMenu</item>
|
||||
<item name="textAppearanceLargePopupMenu">@style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Large</item>
|
||||
<item name="textAppearanceSmallPopupMenu">@style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Small</item>
|
||||
<item name="listPopupWindowStyle">@style/Widget.AppCompat.ListPopupWindow</item>
|
||||
<item name="dropDownListViewStyle">?android:attr/dropDownListViewStyle</item>
|
||||
|
||||
|
||||
<!-- SearchView attributes -->
|
||||
<item name="searchViewStyle">@style/Widget.AppCompat.Light.SearchView</item>
|
||||
<item name="android:dropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item>
|
||||
<item name="textColorSearchUrl">@color/abc_search_url_text</item>
|
||||
<item name="textAppearanceSearchResultTitle">@style/TextAppearance.AppCompat.SearchResult.Title</item>
|
||||
<item name="textAppearanceSearchResultSubtitle">@style/TextAppearance.AppCompat.SearchResult.Subtitle</item>
|
||||
|
||||
|
||||
<!-- ShareActionProvider attributes -->
|
||||
<item name="activityChooserViewStyle">@style/Widget.AppCompat.ActivityChooserView</item>
|
||||
|
||||
|
||||
<!-- Toolbar styles -->
|
||||
<item name="toolbarStyle">@style/Widget.AppCompat.Toolbar</item>
|
||||
<item name="toolbarNavigationButtonStyle">@style/Widget.AppCompat.Toolbar.Button.Navigation</item>
|
||||
|
||||
@ -798,7 +800,7 @@
|
||||
<item name="editTextColor">?android:attr/textColorPrimary</item>
|
||||
<item name="autoCompleteTextViewStyle">@style/Widget.AppCompat.AutoCompleteTextView</item>
|
||||
|
||||
|
||||
<!-- Color palette -->
|
||||
<item name="colorPrimaryDark">@color/primary_dark_material_light</item>
|
||||
<item name="colorPrimary">@color/primary_material_light</item>
|
||||
<item name="colorAccent">@color/accent_material_light</item>
|
||||
@ -819,7 +821,7 @@
|
||||
<item name="ratingBarStyle">@style/Widget.AppCompat.RatingBar</item>
|
||||
<item name="seekBarStyle">@style/Widget.AppCompat.SeekBar</item>
|
||||
|
||||
|
||||
<!-- Button styles -->
|
||||
<item name="buttonStyle">@style/Widget.AppCompat.Button</item>
|
||||
<item name="buttonStyleSmall">@style/Widget.AppCompat.Button.Small</item>
|
||||
<item name="android:textAppearanceButton">@style/TextAppearance.AppCompat.Widget.Button</item>
|
||||
@ -832,7 +834,7 @@
|
||||
<item name="buttonBarNegativeButtonStyle">?attr/buttonBarButtonStyle</item>
|
||||
<item name="buttonBarNeutralButtonStyle">?attr/buttonBarButtonStyle</item>
|
||||
|
||||
|
||||
<!-- Dialog attributes -->
|
||||
<item name="dialogTheme">@style/Theme.AppCompat.Light.Dialog</item>
|
||||
<item name="dialogPreferredPadding">@dimen/abc_dialog_padding_material</item>
|
||||
|
||||
@ -842,7 +844,8 @@
|
||||
<item name="textColorAlertDialogListItem">@color/abc_primary_text_material_light</item>
|
||||
<item name="listDividerAlertDialog">@null</item>
|
||||
|
||||
|
||||
<!-- Define these here; ContextThemeWrappers around themes that define them should
|
||||
always clear these values. -->
|
||||
<item name="windowFixedWidthMajor">0dp</item>
|
||||
<item name="windowFixedWidthMinor">0dp</item>
|
||||
<item name="windowFixedHeightMajor">0dp</item>
|
||||
@ -1176,7 +1179,7 @@
|
||||
<style name="Platform.AppCompat" parent="android:Theme">
|
||||
<item name="android:windowNoTitle">true</item>
|
||||
|
||||
|
||||
<!-- Window colors -->
|
||||
<item name="android:colorForeground">@color/foreground_material_dark</item>
|
||||
<item name="android:colorForegroundInverse">@color/foreground_material_light</item>
|
||||
<item name="android:colorBackground">@color/background_material_dark</item>
|
||||
@ -1185,7 +1188,7 @@
|
||||
<item name="android:backgroundDimAmount">0.6</item>
|
||||
<item name="android:windowBackground">@color/background_material_dark</item>
|
||||
|
||||
|
||||
<!-- Text colors -->
|
||||
<item name="android:textColorPrimary">@color/abc_primary_text_material_dark</item>
|
||||
<item name="android:textColorPrimaryInverse">@color/abc_primary_text_material_light</item>
|
||||
<item name="android:textColorPrimaryDisableOnly">@color/abc_primary_text_disable_only_material_dark</item>
|
||||
@ -1198,7 +1201,7 @@
|
||||
<item name="android:textColorHighlight">@color/highlighted_text_material_dark</item>
|
||||
<item name="android:textColorLink">?attr/colorAccent</item>
|
||||
|
||||
|
||||
<!-- Text styles -->
|
||||
<item name="android:textAppearance">@style/TextAppearance.AppCompat</item>
|
||||
<item name="android:textAppearanceInverse">@style/TextAppearance.AppCompat.Inverse</item>
|
||||
<item name="android:textAppearanceLarge">@style/TextAppearance.AppCompat.Large</item>
|
||||
@ -1214,7 +1217,7 @@
|
||||
<style name="Platform.AppCompat.Light" parent="android:Theme.Light">
|
||||
<item name="android:windowNoTitle">true</item>
|
||||
|
||||
|
||||
<!-- Window colors -->
|
||||
<item name="android:colorForeground">@color/foreground_material_light</item>
|
||||
<item name="android:colorForegroundInverse">@color/foreground_material_dark</item>
|
||||
<item name="android:colorBackground">@color/background_material_light</item>
|
||||
@ -1223,7 +1226,7 @@
|
||||
<item name="android:backgroundDimAmount">0.6</item>
|
||||
<item name="android:windowBackground">@color/background_material_light</item>
|
||||
|
||||
|
||||
<!-- Text colors -->
|
||||
<item name="android:textColorPrimary">@color/abc_primary_text_material_light</item>
|
||||
<item name="android:textColorPrimaryInverse">@color/abc_primary_text_material_dark</item>
|
||||
<item name="android:textColorSecondary">@color/abc_secondary_text_material_light</item>
|
||||
@ -1237,7 +1240,7 @@
|
||||
<item name="android:textColorHighlight">@color/highlighted_text_material_light</item>
|
||||
<item name="android:textColorLink">?attr/colorAccent</item>
|
||||
|
||||
|
||||
<!-- Text styles -->
|
||||
<item name="android:textAppearance">@style/TextAppearance.AppCompat</item>
|
||||
<item name="android:textAppearanceInverse">@style/TextAppearance.AppCompat.Inverse</item>
|
||||
<item name="android:textAppearanceLarge">@style/TextAppearance.AppCompat.Large</item>
|
||||
@ -1252,12 +1255,12 @@
|
||||
</style>
|
||||
<style name="Platform.ThemeOverlay.AppCompat" parent=""/>
|
||||
<style name="Platform.ThemeOverlay.AppCompat.Dark">
|
||||
|
||||
<!-- Action Bar styles -->
|
||||
<item name="actionBarItemBackground">@drawable/abc_item_background_holo_dark</item>
|
||||
<item name="actionDropDownStyle">@style/Widget.AppCompat.Spinner.DropDown.ActionBar</item>
|
||||
<item name="selectableItemBackground">@drawable/abc_item_background_holo_dark</item>
|
||||
|
||||
|
||||
<!-- SearchView styles -->
|
||||
<item name="android:autoCompleteTextViewStyle">@style/Widget.AppCompat.AutoCompleteTextView</item>
|
||||
<item name="android:dropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item>
|
||||
</style>
|
||||
@ -1266,7 +1269,7 @@
|
||||
<item name="actionDropDownStyle">@style/Widget.AppCompat.Light.Spinner.DropDown.ActionBar</item>
|
||||
<item name="selectableItemBackground">@drawable/abc_item_background_holo_light</item>
|
||||
|
||||
|
||||
<!-- SearchView attributes -->
|
||||
<item name="android:autoCompleteTextViewStyle">@style/Widget.AppCompat.Light.AutoCompleteTextView</item>
|
||||
<item name="android:dropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item>
|
||||
</style>
|
||||
|
Binary file not shown.
Reference in New Issue
Block a user