julian/EndlessRoll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TableRows of LevelsScreen are filled with default textViews which are removed when levelButtons are to be added (because of android 7.0)

Browse Source
This commit is contained in:
= 2017-07-27 18:17:10 +02:00
parent 4d07863563
commit 3bdc963525
8 changed files with 5190 additions and 1456 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -4,7 +4,7 @@ android {
signingConfigs { signingConfigs {
} }
compileSdkVersion 23 compileSdkVersion 23
buildToolsVersion '25.0.0' buildToolsVersion '25.0.2'
defaultConfig { defaultConfig {
applicationId 'de.frajul.endlessroll' applicationId 'de.frajul.endlessroll'
minSdkVersion 12 minSdkVersion 12

6488
app/build/intermediates/blame/res/debug/multi/values.json
View File

File diff suppressed because it is too large Load Diff

12
app/build/intermediates/blame/res/debug/single/layout.json
View File

@ -3,22 +3,22 @@
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\levels.xml", "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\levels.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\levels.xml" "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\levels.xml"
}, },
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\toolshop.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\toolshop.xml"
},
{ {
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\tutorial.xml", "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\tutorial.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\tutorial.xml" "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\tutorial.xml"
}, },
{ {
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\abc_screen_simple_overlay_action_mode.xml", "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\toolshop.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\layout\\abc_screen_simple_overlay_action_mode.xml" "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\toolshop.xml"
}, },
{ {
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\worlds.xml", "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\worlds.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\worlds.xml" "source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\layout\\worlds.xml"
}, },
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\abc_screen_simple_overlay_action_mode.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\layout\\abc_screen_simple_overlay_action_mode.xml"
},
{ {
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\abc_screen_simple.xml", "merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\layout\\abc_screen_simple.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\layout\\abc_screen_simple.xml" "source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\layout\\abc_screen_simple.xml"

4
app/build/intermediates/incremental/mergeDebugResources/merger.xml
View File

File diff suppressed because one or more lines are too long

25
app/build/intermediates/res/merged/debug/layout/levels.xml
View File

@ -2,16 +2,16 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:background="@drawable/backgrounds_menu_grass"
android:background="@drawable/backgrounds_menu_grass"> android:orientation="vertical">
<include <include
android:id="@+id/levels_topbar"
layout="@layout/topbar" layout="@layout/topbar"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="top" android:layout_gravity="top"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"/>
android:id="@+id/levels_topbar"/>
<HorizontalScrollView <HorizontalScrollView
android:id="@+id/horizontalScrollView" android:id="@+id/horizontalScrollView"
@ -28,13 +28,26 @@
android:id="@+id/levels_topRow" android:id="@+id/levels_topRow"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1">
<!--Will be removed before levelbuttons are added. Just there because android 7.0 doesn't like empty tableRows ;-) -->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</TableRow>
<TableRow <TableRow
android:id="@+id/levels_bottomRow" android:id="@+id/levels_bottomRow"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1">
<!--Will be removed before levelbuttons are added. Just there because android 7.0 doesn't like empty tableRows ;-) -->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</TableRow>
</TableLayout> </TableLayout>
</HorizontalScrollView> </HorizontalScrollView>

90
app/build/intermediates/res/merged/debug/values/values.xml
View File

@ -454,7 +454,7 @@
<item name="actionBarWidgetTheme">@null</item> <item name="actionBarWidgetTheme">@null</item>
<item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item> <item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
<!-- Panel attributes -->
<item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_dark</item> <item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_dark</item>
<item name="colorPrimaryDark">@color/primary_dark_material_dark</item> <item name="colorPrimaryDark">@color/primary_dark_material_dark</item>
@ -504,7 +504,7 @@
<item name="colorButtonNormal">@color/button_material_dark</item> <item name="colorButtonNormal">@color/button_material_dark</item>
<item name="colorSwitchThumbNormal">@color/switch_thumb_material_dark</item> <item name="colorSwitchThumbNormal">@color/switch_thumb_material_dark</item>
<!-- Used by MediaRouter -->
<item name="isLightTheme">false</item> <item name="isLightTheme">false</item>
</style> </style>
<style name="Base.ThemeOverlay.AppCompat.Dark.ActionBar"> <style name="Base.ThemeOverlay.AppCompat.Dark.ActionBar">
@ -535,7 +535,7 @@
<item name="colorButtonNormal">@color/button_material_light</item> <item name="colorButtonNormal">@color/button_material_light</item>
<item name="colorSwitchThumbNormal">@color/switch_thumb_material_light</item> <item name="colorSwitchThumbNormal">@color/switch_thumb_material_light</item>
<!-- Used by MediaRouter -->
<item name="isLightTheme">true</item> <item name="isLightTheme">true</item>
</style> </style>
<style name="Base.V7.Theme.AppCompat" parent="Platform.AppCompat"> <style name="Base.V7.Theme.AppCompat" parent="Platform.AppCompat">
@ -545,7 +545,7 @@
<item name="windowActionModeOverlay">false</item> <item name="windowActionModeOverlay">false</item>
<item name="actionBarPopupTheme">@null</item> <item name="actionBarPopupTheme">@null</item>
<!-- Used by MediaRouter -->
<item name="isLightTheme">false</item> <item name="isLightTheme">false</item>
<item name="selectableItemBackground">@drawable/abc_item_background_holo_dark</item> <item name="selectableItemBackground">@drawable/abc_item_background_holo_dark</item>
@ -556,7 +556,7 @@
<item name="dividerVertical">@drawable/abc_list_divider_mtrl_alpha</item> <item name="dividerVertical">@drawable/abc_list_divider_mtrl_alpha</item>
<item name="dividerHorizontal">@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="actionBarTabStyle">@style/Widget.AppCompat.ActionBar.TabView</item>
<item name="actionBarTabBarStyle">@style/Widget.AppCompat.ActionBar.TabBar</item> <item name="actionBarTabBarStyle">@style/Widget.AppCompat.ActionBar.TabBar</item>
<item name="actionBarTabTextStyle">@style/Widget.AppCompat.ActionBar.TabText</item> <item name="actionBarTabTextStyle">@style/Widget.AppCompat.ActionBar.TabText</item>
@ -573,10 +573,10 @@
<item name="actionMenuTextAppearance">@style/TextAppearance.AppCompat.Widget.ActionBar.Menu</item> <item name="actionMenuTextAppearance">@style/TextAppearance.AppCompat.Widget.ActionBar.Menu</item>
<item name="actionMenuTextColor">?android:attr/textColorPrimaryDisableOnly</item> <item name="actionMenuTextColor">?android:attr/textColorPrimaryDisableOnly</item>
<!-- Dropdown Spinner Attributes -->
<item name="actionDropDownStyle">@style/Widget.AppCompat.Spinner.DropDown.ActionBar</item> <item name="actionDropDownStyle">@style/Widget.AppCompat.Spinner.DropDown.ActionBar</item>
<!-- Action Mode -->
<item name="actionModeStyle">@style/Widget.AppCompat.ActionMode</item> <item name="actionModeStyle">@style/Widget.AppCompat.ActionMode</item>
<item name="actionModeBackground">@drawable/abc_cab_background_top_material</item> <item name="actionModeBackground">@drawable/abc_cab_background_top_material</item>
<item name="actionModeSplitBackground">?attr/colorPrimaryDark</item> <item name="actionModeSplitBackground">?attr/colorPrimaryDark</item>
@ -589,14 +589,14 @@
<item name="actionModeSelectAllDrawable">@drawable/abc_ic_menu_selectall_mtrl_alpha</item> <item name="actionModeSelectAllDrawable">@drawable/abc_ic_menu_selectall_mtrl_alpha</item>
<item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_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="panelMenuListWidth">@dimen/abc_panel_menu_list_width</item>
<item name="panelMenuListTheme">@style/Theme.AppCompat.CompactMenu</item> <item name="panelMenuListTheme">@style/Theme.AppCompat.CompactMenu</item>
<item name="panelBackground">@drawable/abc_menu_hardkey_panel_mtrl_mult</item> <item name="panelBackground">@drawable/abc_menu_hardkey_panel_mtrl_mult</item>
<item name="android:panelBackground">@android:color/transparent</item> <item name="android:panelBackground">@android:color/transparent</item>
<item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_dark</item> <item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_dark</item>
<!-- List attributes -->
<item name="textAppearanceListItem">@style/TextAppearance.AppCompat.Subhead</item> <item name="textAppearanceListItem">@style/TextAppearance.AppCompat.Subhead</item>
<item name="textAppearanceListItemSmall">@style/TextAppearance.AppCompat.Subhead</item> <item name="textAppearanceListItemSmall">@style/TextAppearance.AppCompat.Subhead</item>
<item name="listPreferredItemHeight">64dp</item> <item name="listPreferredItemHeight">64dp</item>
@ -605,33 +605,33 @@
<item name="listPreferredItemPaddingLeft">@dimen/abc_list_item_padding_horizontal_material</item> <item name="listPreferredItemPaddingLeft">@dimen/abc_list_item_padding_horizontal_material</item>
<item name="listPreferredItemPaddingRight">@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="spinnerStyle">@style/Widget.AppCompat.Spinner</item>
<item name="android:spinnerItemStyle">@style/Widget.AppCompat.TextView.SpinnerItem</item> <item name="android:spinnerItemStyle">@style/Widget.AppCompat.TextView.SpinnerItem</item>
<item name="android:dropDownListViewStyle">@style/Widget.AppCompat.ListView.DropDown</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="spinnerDropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item>
<item name="dropdownListPreferredItemHeight">?attr/listPreferredItemHeightSmall</item> <item name="dropdownListPreferredItemHeight">?attr/listPreferredItemHeightSmall</item>
<!-- Popup Menu styles -->
<item name="popupMenuStyle">@style/Widget.AppCompat.PopupMenu</item> <item name="popupMenuStyle">@style/Widget.AppCompat.PopupMenu</item>
<item name="textAppearanceLargePopupMenu">@style/TextAppearance.AppCompat.Widget.PopupMenu.Large</item> <item name="textAppearanceLargePopupMenu">@style/TextAppearance.AppCompat.Widget.PopupMenu.Large</item>
<item name="textAppearanceSmallPopupMenu">@style/TextAppearance.AppCompat.Widget.PopupMenu.Small</item> <item name="textAppearanceSmallPopupMenu">@style/TextAppearance.AppCompat.Widget.PopupMenu.Small</item>
<item name="listPopupWindowStyle">@style/Widget.AppCompat.ListPopupWindow</item> <item name="listPopupWindowStyle">@style/Widget.AppCompat.ListPopupWindow</item>
<item name="dropDownListViewStyle">?android:attr/dropDownListViewStyle</item> <item name="dropDownListViewStyle">?android:attr/dropDownListViewStyle</item>
<!-- SearchView attributes -->
<item name="searchViewStyle">@style/Widget.AppCompat.SearchView</item> <item name="searchViewStyle">@style/Widget.AppCompat.SearchView</item>
<item name="android:dropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item> <item name="android:dropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item>
<item name="textColorSearchUrl">@color/abc_search_url_text</item> <item name="textColorSearchUrl">@color/abc_search_url_text</item>
<item name="textAppearanceSearchResultTitle">@style/TextAppearance.AppCompat.SearchResult.Title</item> <item name="textAppearanceSearchResultTitle">@style/TextAppearance.AppCompat.SearchResult.Title</item>
<item name="textAppearanceSearchResultSubtitle">@style/TextAppearance.AppCompat.SearchResult.Subtitle</item> <item name="textAppearanceSearchResultSubtitle">@style/TextAppearance.AppCompat.SearchResult.Subtitle</item>
<!-- ShareActionProvider attributes -->
<item name="activityChooserViewStyle">@style/Widget.AppCompat.ActivityChooserView</item> <item name="activityChooserViewStyle">@style/Widget.AppCompat.ActivityChooserView</item>
<!-- Toolbar styles -->
<item name="toolbarStyle">@style/Widget.AppCompat.Toolbar</item> <item name="toolbarStyle">@style/Widget.AppCompat.Toolbar</item>
<item name="toolbarNavigationButtonStyle">@style/Widget.AppCompat.Toolbar.Button.Navigation</item> <item name="toolbarNavigationButtonStyle">@style/Widget.AppCompat.Toolbar.Button.Navigation</item>
@ -640,7 +640,7 @@
<item name="editTextColor">?android:attr/textColorPrimary</item> <item name="editTextColor">?android:attr/textColorPrimary</item>
<item name="autoCompleteTextViewStyle">@style/Widget.AppCompat.AutoCompleteTextView</item> <item name="autoCompleteTextViewStyle">@style/Widget.AppCompat.AutoCompleteTextView</item>
<!-- Color palette -->
<item name="colorPrimaryDark">@color/primary_dark_material_dark</item> <item name="colorPrimaryDark">@color/primary_dark_material_dark</item>
<item name="colorPrimary">@color/primary_material_dark</item> <item name="colorPrimary">@color/primary_material_dark</item>
<item name="colorAccent">@color/accent_material_dark</item> <item name="colorAccent">@color/accent_material_dark</item>
@ -661,7 +661,7 @@
<item name="ratingBarStyle">@style/Widget.AppCompat.RatingBar</item> <item name="ratingBarStyle">@style/Widget.AppCompat.RatingBar</item>
<item name="seekBarStyle">@style/Widget.AppCompat.SeekBar</item> <item name="seekBarStyle">@style/Widget.AppCompat.SeekBar</item>
<!-- Button styles -->
<item name="buttonStyle">@style/Widget.AppCompat.Button</item> <item name="buttonStyle">@style/Widget.AppCompat.Button</item>
<item name="buttonStyleSmall">@style/Widget.AppCompat.Button.Small</item> <item name="buttonStyleSmall">@style/Widget.AppCompat.Button.Small</item>
<item name="android:textAppearanceButton">@style/TextAppearance.AppCompat.Widget.Button</item> <item name="android:textAppearanceButton">@style/TextAppearance.AppCompat.Widget.Button</item>
@ -674,7 +674,7 @@
<item name="buttonBarNegativeButtonStyle">?attr/buttonBarButtonStyle</item> <item name="buttonBarNegativeButtonStyle">?attr/buttonBarButtonStyle</item>
<item name="buttonBarNeutralButtonStyle">?attr/buttonBarButtonStyle</item> <item name="buttonBarNeutralButtonStyle">?attr/buttonBarButtonStyle</item>
<!-- Dialog attributes -->
<item name="dialogTheme">@style/Theme.AppCompat.Dialog</item> <item name="dialogTheme">@style/Theme.AppCompat.Dialog</item>
<item name="dialogPreferredPadding">@dimen/abc_dialog_padding_material</item> <item name="dialogPreferredPadding">@dimen/abc_dialog_padding_material</item>
@ -684,7 +684,8 @@
<item name="textColorAlertDialogListItem">@color/abc_primary_text_material_dark</item> <item name="textColorAlertDialogListItem">@color/abc_primary_text_material_dark</item>
<item name="listDividerAlertDialog">@null</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="windowFixedWidthMajor">0dp</item>
<item name="windowFixedWidthMinor">0dp</item> <item name="windowFixedWidthMinor">0dp</item>
<item name="windowFixedHeightMajor">0dp</item> <item name="windowFixedHeightMajor">0dp</item>
@ -719,7 +720,7 @@
<item name="windowActionModeOverlay">false</item> <item name="windowActionModeOverlay">false</item>
<item name="actionBarPopupTheme">@null</item> <item name="actionBarPopupTheme">@null</item>
<!-- Used by MediaRouter -->
<item name="isLightTheme">true</item> <item name="isLightTheme">true</item>
<item name="selectableItemBackground">@drawable/abc_item_background_holo_light</item> <item name="selectableItemBackground">@drawable/abc_item_background_holo_light</item>
@ -730,7 +731,7 @@
<item name="dividerVertical">@drawable/abc_list_divider_mtrl_alpha</item> <item name="dividerVertical">@drawable/abc_list_divider_mtrl_alpha</item>
<item name="dividerHorizontal">@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="actionBarTabStyle">@style/Widget.AppCompat.Light.ActionBar.TabView</item>
<item name="actionBarTabBarStyle">@style/Widget.AppCompat.Light.ActionBar.TabBar</item> <item name="actionBarTabBarStyle">@style/Widget.AppCompat.Light.ActionBar.TabBar</item>
<item name="actionBarTabTextStyle">@style/Widget.AppCompat.Light.ActionBar.TabText</item> <item name="actionBarTabTextStyle">@style/Widget.AppCompat.Light.ActionBar.TabText</item>
@ -747,7 +748,7 @@
<item name="actionMenuTextAppearance">@style/TextAppearance.AppCompat.Widget.ActionBar.Menu</item> <item name="actionMenuTextAppearance">@style/TextAppearance.AppCompat.Widget.ActionBar.Menu</item>
<item name="actionMenuTextColor">?android:attr/textColorPrimaryDisableOnly</item> <item name="actionMenuTextColor">?android:attr/textColorPrimaryDisableOnly</item>
<!-- Action Mode -->
<item name="actionModeStyle">@style/Widget.AppCompat.ActionMode</item> <item name="actionModeStyle">@style/Widget.AppCompat.ActionMode</item>
<item name="actionModeBackground">@drawable/abc_cab_background_top_material</item> <item name="actionModeBackground">@drawable/abc_cab_background_top_material</item>
<item name="actionModeSplitBackground">?attr/colorPrimaryDark</item> <item name="actionModeSplitBackground">?attr/colorPrimaryDark</item>
@ -760,17 +761,17 @@
<item name="actionModeSelectAllDrawable">@drawable/abc_ic_menu_selectall_mtrl_alpha</item> <item name="actionModeSelectAllDrawable">@drawable/abc_ic_menu_selectall_mtrl_alpha</item>
<item name="actionModeShareDrawable">@drawable/abc_ic_menu_share_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> <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="panelMenuListWidth">@dimen/abc_panel_menu_list_width</item>
<item name="panelMenuListTheme">@style/Theme.AppCompat.CompactMenu</item> <item name="panelMenuListTheme">@style/Theme.AppCompat.CompactMenu</item>
<item name="panelBackground">@drawable/abc_menu_hardkey_panel_mtrl_mult</item> <item name="panelBackground">@drawable/abc_menu_hardkey_panel_mtrl_mult</item>
<item name="android:panelBackground">@android:color/transparent</item> <item name="android:panelBackground">@android:color/transparent</item>
<item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_light</item> <item name="listChoiceBackgroundIndicator">@drawable/abc_list_selector_holo_light</item>
<!-- List attributes -->
<item name="textAppearanceListItem">@style/TextAppearance.AppCompat.Subhead</item> <item name="textAppearanceListItem">@style/TextAppearance.AppCompat.Subhead</item>
<item name="textAppearanceListItemSmall">@style/TextAppearance.AppCompat.Subhead</item> <item name="textAppearanceListItemSmall">@style/TextAppearance.AppCompat.Subhead</item>
<item name="listPreferredItemHeight">64dp</item> <item name="listPreferredItemHeight">64dp</item>
@ -779,33 +780,33 @@
<item name="listPreferredItemPaddingLeft">@dimen/abc_list_item_padding_horizontal_material</item> <item name="listPreferredItemPaddingLeft">@dimen/abc_list_item_padding_horizontal_material</item>
<item name="listPreferredItemPaddingRight">@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="spinnerStyle">@style/Widget.AppCompat.Spinner</item>
<item name="android:spinnerItemStyle">@style/Widget.AppCompat.TextView.SpinnerItem</item> <item name="android:spinnerItemStyle">@style/Widget.AppCompat.TextView.SpinnerItem</item>
<item name="android:dropDownListViewStyle">@style/Widget.AppCompat.ListView.DropDown</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="spinnerDropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item>
<item name="dropdownListPreferredItemHeight">?attr/listPreferredItemHeightSmall</item> <item name="dropdownListPreferredItemHeight">?attr/listPreferredItemHeightSmall</item>
<!-- Popup Menu styles -->
<item name="popupMenuStyle">@style/Widget.AppCompat.Light.PopupMenu</item> <item name="popupMenuStyle">@style/Widget.AppCompat.Light.PopupMenu</item>
<item name="textAppearanceLargePopupMenu">@style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Large</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="textAppearanceSmallPopupMenu">@style/TextAppearance.AppCompat.Light.Widget.PopupMenu.Small</item>
<item name="listPopupWindowStyle">@style/Widget.AppCompat.ListPopupWindow</item> <item name="listPopupWindowStyle">@style/Widget.AppCompat.ListPopupWindow</item>
<item name="dropDownListViewStyle">?android:attr/dropDownListViewStyle</item> <item name="dropDownListViewStyle">?android:attr/dropDownListViewStyle</item>
<!-- SearchView attributes -->
<item name="searchViewStyle">@style/Widget.AppCompat.Light.SearchView</item> <item name="searchViewStyle">@style/Widget.AppCompat.Light.SearchView</item>
<item name="android:dropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item> <item name="android:dropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item>
<item name="textColorSearchUrl">@color/abc_search_url_text</item> <item name="textColorSearchUrl">@color/abc_search_url_text</item>
<item name="textAppearanceSearchResultTitle">@style/TextAppearance.AppCompat.SearchResult.Title</item> <item name="textAppearanceSearchResultTitle">@style/TextAppearance.AppCompat.SearchResult.Title</item>
<item name="textAppearanceSearchResultSubtitle">@style/TextAppearance.AppCompat.SearchResult.Subtitle</item> <item name="textAppearanceSearchResultSubtitle">@style/TextAppearance.AppCompat.SearchResult.Subtitle</item>
<!-- ShareActionProvider attributes -->
<item name="activityChooserViewStyle">@style/Widget.AppCompat.ActivityChooserView</item> <item name="activityChooserViewStyle">@style/Widget.AppCompat.ActivityChooserView</item>
<!-- Toolbar styles -->
<item name="toolbarStyle">@style/Widget.AppCompat.Toolbar</item> <item name="toolbarStyle">@style/Widget.AppCompat.Toolbar</item>
<item name="toolbarNavigationButtonStyle">@style/Widget.AppCompat.Toolbar.Button.Navigation</item> <item name="toolbarNavigationButtonStyle">@style/Widget.AppCompat.Toolbar.Button.Navigation</item>
@ -814,7 +815,7 @@
<item name="editTextColor">?android:attr/textColorPrimary</item> <item name="editTextColor">?android:attr/textColorPrimary</item>
<item name="autoCompleteTextViewStyle">@style/Widget.AppCompat.AutoCompleteTextView</item> <item name="autoCompleteTextViewStyle">@style/Widget.AppCompat.AutoCompleteTextView</item>
<!-- Color palette -->
<item name="colorPrimaryDark">@color/primary_dark_material_light</item> <item name="colorPrimaryDark">@color/primary_dark_material_light</item>
<item name="colorPrimary">@color/primary_material_light</item> <item name="colorPrimary">@color/primary_material_light</item>
<item name="colorAccent">@color/accent_material_light</item> <item name="colorAccent">@color/accent_material_light</item>
@ -835,7 +836,7 @@
<item name="ratingBarStyle">@style/Widget.AppCompat.RatingBar</item> <item name="ratingBarStyle">@style/Widget.AppCompat.RatingBar</item>
<item name="seekBarStyle">@style/Widget.AppCompat.SeekBar</item> <item name="seekBarStyle">@style/Widget.AppCompat.SeekBar</item>
<!-- Button styles -->
<item name="buttonStyle">@style/Widget.AppCompat.Button</item> <item name="buttonStyle">@style/Widget.AppCompat.Button</item>
<item name="buttonStyleSmall">@style/Widget.AppCompat.Button.Small</item> <item name="buttonStyleSmall">@style/Widget.AppCompat.Button.Small</item>
<item name="android:textAppearanceButton">@style/TextAppearance.AppCompat.Widget.Button</item> <item name="android:textAppearanceButton">@style/TextAppearance.AppCompat.Widget.Button</item>
@ -848,7 +849,7 @@
<item name="buttonBarNegativeButtonStyle">?attr/buttonBarButtonStyle</item> <item name="buttonBarNegativeButtonStyle">?attr/buttonBarButtonStyle</item>
<item name="buttonBarNeutralButtonStyle">?attr/buttonBarButtonStyle</item> <item name="buttonBarNeutralButtonStyle">?attr/buttonBarButtonStyle</item>
<!-- Dialog attributes -->
<item name="dialogTheme">@style/Theme.AppCompat.Light.Dialog</item> <item name="dialogTheme">@style/Theme.AppCompat.Light.Dialog</item>
<item name="dialogPreferredPadding">@dimen/abc_dialog_padding_material</item> <item name="dialogPreferredPadding">@dimen/abc_dialog_padding_material</item>
@ -858,7 +859,8 @@
<item name="textColorAlertDialogListItem">@color/abc_primary_text_material_light</item> <item name="textColorAlertDialogListItem">@color/abc_primary_text_material_light</item>
<item name="listDividerAlertDialog">@null</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="windowFixedWidthMajor">0dp</item>
<item name="windowFixedWidthMinor">0dp</item> <item name="windowFixedWidthMinor">0dp</item>
<item name="windowFixedHeightMajor">0dp</item> <item name="windowFixedHeightMajor">0dp</item>
@ -1192,7 +1194,7 @@
<style name="Platform.AppCompat" parent="android:Theme"> <style name="Platform.AppCompat" parent="android:Theme">
<item name="android:windowNoTitle">true</item> <item name="android:windowNoTitle">true</item>
<!-- Window colors -->
<item name="android:colorForeground">@color/foreground_material_dark</item> <item name="android:colorForeground">@color/foreground_material_dark</item>
<item name="android:colorForegroundInverse">@color/foreground_material_light</item> <item name="android:colorForegroundInverse">@color/foreground_material_light</item>
<item name="android:colorBackground">@color/background_material_dark</item> <item name="android:colorBackground">@color/background_material_dark</item>
@ -1201,7 +1203,7 @@
<item name="android:backgroundDimAmount">0.6</item> <item name="android:backgroundDimAmount">0.6</item>
<item name="android:windowBackground">@color/background_material_dark</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:textColorPrimary">@color/abc_primary_text_material_dark</item>
<item name="android:textColorPrimaryInverse">@color/abc_primary_text_material_light</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> <item name="android:textColorPrimaryDisableOnly">@color/abc_primary_text_disable_only_material_dark</item>
@ -1214,7 +1216,7 @@
<item name="android:textColorHighlight">@color/highlighted_text_material_dark</item> <item name="android:textColorHighlight">@color/highlighted_text_material_dark</item>
<item name="android:textColorLink">?attr/colorAccent</item> <item name="android:textColorLink">?attr/colorAccent</item>
<!-- Text styles -->
<item name="android:textAppearance">@style/TextAppearance.AppCompat</item> <item name="android:textAppearance">@style/TextAppearance.AppCompat</item>
<item name="android:textAppearanceInverse">@style/TextAppearance.AppCompat.Inverse</item> <item name="android:textAppearanceInverse">@style/TextAppearance.AppCompat.Inverse</item>
<item name="android:textAppearanceLarge">@style/TextAppearance.AppCompat.Large</item> <item name="android:textAppearanceLarge">@style/TextAppearance.AppCompat.Large</item>
@ -1230,7 +1232,7 @@
<style name="Platform.AppCompat.Light" parent="android:Theme.Light"> <style name="Platform.AppCompat.Light" parent="android:Theme.Light">
<item name="android:windowNoTitle">true</item> <item name="android:windowNoTitle">true</item>
<!-- Window colors -->
<item name="android:colorForeground">@color/foreground_material_light</item> <item name="android:colorForeground">@color/foreground_material_light</item>
<item name="android:colorForegroundInverse">@color/foreground_material_dark</item> <item name="android:colorForegroundInverse">@color/foreground_material_dark</item>
<item name="android:colorBackground">@color/background_material_light</item> <item name="android:colorBackground">@color/background_material_light</item>
@ -1239,7 +1241,7 @@
<item name="android:backgroundDimAmount">0.6</item> <item name="android:backgroundDimAmount">0.6</item>
<item name="android:windowBackground">@color/background_material_light</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:textColorPrimary">@color/abc_primary_text_material_light</item>
<item name="android:textColorPrimaryInverse">@color/abc_primary_text_material_dark</item> <item name="android:textColorPrimaryInverse">@color/abc_primary_text_material_dark</item>
<item name="android:textColorSecondary">@color/abc_secondary_text_material_light</item> <item name="android:textColorSecondary">@color/abc_secondary_text_material_light</item>
@ -1253,7 +1255,7 @@
<item name="android:textColorHighlight">@color/highlighted_text_material_light</item> <item name="android:textColorHighlight">@color/highlighted_text_material_light</item>
<item name="android:textColorLink">?attr/colorAccent</item> <item name="android:textColorLink">?attr/colorAccent</item>
<!-- Text styles -->
<item name="android:textAppearance">@style/TextAppearance.AppCompat</item> <item name="android:textAppearance">@style/TextAppearance.AppCompat</item>
<item name="android:textAppearanceInverse">@style/TextAppearance.AppCompat.Inverse</item> <item name="android:textAppearanceInverse">@style/TextAppearance.AppCompat.Inverse</item>
<item name="android:textAppearanceLarge">@style/TextAppearance.AppCompat.Large</item> <item name="android:textAppearanceLarge">@style/TextAppearance.AppCompat.Large</item>
@ -1268,12 +1270,12 @@
</style> </style>
<style name="Platform.ThemeOverlay.AppCompat" parent=""/> <style name="Platform.ThemeOverlay.AppCompat" parent=""/>
<style name="Platform.ThemeOverlay.AppCompat.Dark"> <style name="Platform.ThemeOverlay.AppCompat.Dark">
<!-- Action Bar styles -->
<item name="actionBarItemBackground">@drawable/abc_item_background_holo_dark</item> <item name="actionBarItemBackground">@drawable/abc_item_background_holo_dark</item>
<item name="actionDropDownStyle">@style/Widget.AppCompat.Spinner.DropDown.ActionBar</item> <item name="actionDropDownStyle">@style/Widget.AppCompat.Spinner.DropDown.ActionBar</item>
<item name="selectableItemBackground">@drawable/abc_item_background_holo_dark</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:autoCompleteTextViewStyle">@style/Widget.AppCompat.AutoCompleteTextView</item>
<item name="android:dropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item> <item name="android:dropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item>
</style> </style>
@ -1282,7 +1284,7 @@
<item name="actionDropDownStyle">@style/Widget.AppCompat.Light.Spinner.DropDown.ActionBar</item> <item name="actionDropDownStyle">@style/Widget.AppCompat.Light.Spinner.DropDown.ActionBar</item>
<item name="selectableItemBackground">@drawable/abc_item_background_holo_light</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:autoCompleteTextViewStyle">@style/Widget.AppCompat.Light.AutoCompleteTextView</item>
<item name="android:dropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item> <item name="android:dropDownItemStyle">@style/Widget.AppCompat.DropDownItem.Spinner</item>
</style> </style>

BIN
app/build/intermediates/res/resources-debug.ap_
View File

Binary file not shown.

25
app/src/main/res/layout/levels.xml
View File

@ -2,16 +2,16 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:background="@drawable/backgrounds_menu_grass"
android:background="@drawable/backgrounds_menu_grass"> android:orientation="vertical">
<include <include
android:id="@+id/levels_topbar"
layout="@layout/topbar" layout="@layout/topbar"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="top" android:layout_gravity="top"
android:layout_marginBottom="5dp" android:layout_marginBottom="5dp"/>
android:id="@+id/levels_topbar"/>
<HorizontalScrollView <HorizontalScrollView
android:id="@+id/horizontalScrollView" android:id="@+id/horizontalScrollView"
@ -28,13 +28,26 @@
android:id="@+id/levels_topRow" android:id="@+id/levels_topRow"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1">
<!--Will be removed before levelbuttons are added. Just there because android 7.0 doesn't like empty tableRows ;-) -->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</TableRow>
<TableRow <TableRow
android:id="@+id/levels_bottomRow" android:id="@+id/levels_bottomRow"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"/> android:layout_weight="1">
<!--Will be removed before levelbuttons are added. Just there because android 7.0 doesn't like empty tableRows ;-) -->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</TableRow>
</TableLayout> </TableLayout>
</HorizontalScrollView> </HorizontalScrollView>