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

First shape-inspector implementation

Browse Source 
Toolshop layout polished
This commit is contained in:
=
2017-10-29 13:06:46 +01:00
parent 8cc9353c3b
commit c9e718f6ad
13 changed files with 273 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
app/build/generated/source/r/debug/android/support/v7/appcompat/R.java
View File

@ -529,29 +529,29 @@ public final class R {
public static final int search_src_text = 0x7f080066; public static final int search_src_text = 0x7f080066;
public static final int search_voice_btn = 0x7f080067; public static final int search_voice_btn = 0x7f080067;
public static final int select_dialog_listview = 0x7f080068; public static final int select_dialog_listview = 0x7f080068;
public static final int shortcut = 0x7f080071; public static final int shortcut = 0x7f080072;
public static final int showCustom = 0x7f080076; public static final int showCustom = 0x7f080077;
public static final int showHome = 0x7f080077; public static final int showHome = 0x7f080078;
public static final int showTitle = 0x7f080078; public static final int showTitle = 0x7f080079;
public static final int spacer = 0x7f080079; public static final int spacer = 0x7f08007a;
public static final int split_action_bar = 0x7f08007a; public static final int split_action_bar = 0x7f08007b;
public static final int src_atop = 0x7f08007b; public static final int src_atop = 0x7f08007c;
public static final int src_in = 0x7f08007c; public static final int src_in = 0x7f08007d;
public static final int src_over = 0x7f08007d; public static final int src_over = 0x7f08007e;
public static final int status_bar_latest_event_content = 0x7f080083; public static final int status_bar_latest_event_content = 0x7f080084;
public static final int submit_area = 0x7f080084; public static final int submit_area = 0x7f080085;
public static final int tabMode = 0x7f080085; public static final int tabMode = 0x7f080086;
public static final int text = 0x7f080086; public static final int text = 0x7f080087;
public static final int text2 = 0x7f080087; public static final int text2 = 0x7f080088;
public static final int textSpacerNoButtons = 0x7f080088; public static final int textSpacerNoButtons = 0x7f080089;
public static final int time = 0x7f080089; public static final int time = 0x7f08008a;
public static final int title = 0x7f08008a; public static final int title = 0x7f08008b;
public static final int title_template = 0x7f08008b; public static final int title_template = 0x7f08008c;
public static final int topPanel = 0x7f0800a7; public static final int topPanel = 0x7f0800a9;
public static final int up = 0x7f0800b9; public static final int up = 0x7f0800bb;
public static final int useLogo = 0x7f0800ba; public static final int useLogo = 0x7f0800bc;
public static final int withText = 0x7f0800bb; public static final int withText = 0x7f0800bd;
public static final int wrap_content = 0x7f0800c5; public static final int wrap_content = 0x7f0800c7;
} }
public static final class integer { public static final class integer {
public static final int abc_config_activityDefaultDur = 0x7f090000; public static final int abc_config_activityDefaultDur = 0x7f090000;
@ -597,7 +597,7 @@ public final class R {
public static final int select_dialog_item_material = 0x7f0a0029; public static final int select_dialog_item_material = 0x7f0a0029;
public static final int select_dialog_multichoice_material = 0x7f0a002a; public static final int select_dialog_multichoice_material = 0x7f0a002a;
public static final int select_dialog_singlechoice_material = 0x7f0a002b; public static final int select_dialog_singlechoice_material = 0x7f0a002b;
public static final int support_simple_spinner_dropdown_item = 0x7f0a0031; public static final int support_simple_spinner_dropdown_item = 0x7f0a0032;
} }
public static final class string { public static final class string {
public static final int abc_action_bar_home_description = 0x7f0d0000; public static final int abc_action_bar_home_description = 0x7f0d0000;

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

File diff suppressed because one or more lines are too long

214
app/build/intermediates/symbols/debug/R.txt
View File

@ -397,7 +397,10 @@ int dimen highlight_alpha_material_light 0x7f060047
int dimen notification_large_icon_height 0x7f060048 int dimen notification_large_icon_height 0x7f060048
int dimen notification_large_icon_width 0x7f060049 int dimen notification_large_icon_width 0x7f060049
int dimen notification_subtext_size 0x7f06004a int dimen notification_subtext_size 0x7f06004a
int dimen tool_inspector_width 0x7f06004b int dimen shape_inspector_width 0x7f06004b
int dimen tool_button_height 0x7f06004c
int dimen tool_button_width 0x7f06004d
int dimen tool_inspector_width 0x7f06004e
int drawable abc_ab_share_pack_mtrl_alpha 0x7f070000 int drawable abc_ab_share_pack_mtrl_alpha 0x7f070000
int drawable abc_action_bar_item_background_material 0x7f070001 int drawable abc_action_bar_item_background_material 0x7f070001
int drawable abc_btn_borderless_material 0x7f070002 int drawable abc_btn_borderless_material 0x7f070002
@ -656,93 +659,95 @@ int id settings_topbar 0x7f08006b
int id shape_button_button 0x7f08006c int id shape_button_button 0x7f08006c
int id shape_button_textview 0x7f08006d int id shape_button_textview 0x7f08006d
int id shape_shop_bottomRow 0x7f08006e int id shape_shop_bottomRow 0x7f08006e
int id shape_shop_topRow 0x7f08006f int id shape_shop_shape_inspector 0x7f08006f
int id shape_shop_topbar 0x7f080070 int id shape_shop_topRow 0x7f080070
int id shortcut 0x7f080071 int id shape_shop_topbar 0x7f080071
int id shortmenu_continue 0x7f080072 int id shortcut 0x7f080072
int id shortmenu_exit 0x7f080073 int id shortmenu_continue 0x7f080073
int id shortmenu_restart 0x7f080074 int id shortmenu_exit 0x7f080074
int id shortmenu_topbar 0x7f080075 int id shortmenu_restart 0x7f080075
int id showCustom 0x7f080076 int id shortmenu_topbar 0x7f080076
int id showHome 0x7f080077 int id showCustom 0x7f080077
int id showTitle 0x7f080078 int id showHome 0x7f080078
int id spacer 0x7f080079 int id showTitle 0x7f080079
int id split_action_bar 0x7f08007a int id spacer 0x7f08007a
int id src_atop 0x7f08007b int id split_action_bar 0x7f08007b
int id src_in 0x7f08007c int id src_atop 0x7f08007c
int id src_over 0x7f08007d int id src_in 0x7f08007d
int id startscreen_gain_90_ep 0x7f08007e int id src_over 0x7f08007e
int id startscreen_play 0x7f08007f int id startscreen_gain_90_ep 0x7f08007f
int id startscreen_settings 0x7f080080 int id startscreen_play 0x7f080080
int id startscreen_to_gl_test_screen 0x7f080081 int id startscreen_settings 0x7f080081
int id startscreen_unlock_levels 0x7f080082 int id startscreen_to_gl_test_screen 0x7f080082
int id status_bar_latest_event_content 0x7f080083 int id startscreen_unlock_levels 0x7f080083
int id submit_area 0x7f080084 int id status_bar_latest_event_content 0x7f080084
int id tabMode 0x7f080085 int id submit_area 0x7f080085
int id text 0x7f080086 int id tabMode 0x7f080086
int id text2 0x7f080087 int id text 0x7f080087
int id textSpacerNoButtons 0x7f080088 int id text2 0x7f080088
int id time 0x7f080089 int id textSpacerNoButtons 0x7f080089
int id title 0x7f08008a int id time 0x7f08008a
int id title_template 0x7f08008b int id title 0x7f08008b
int id toolProgressBar 0x7f08008c int id title_template 0x7f08008c
int id toolProgressBarView 0x7f08008d int id tool_button_animation_layer 0x7f08008d
int id toolProgressButtonAnimation 0x7f08008e int id tool_button_background_layer 0x7f08008e
int id tool_inspector_description 0x7f08008f int id tool_button_progress_bar 0x7f08008f
int id tool_inspector_imageview 0x7f080090 int id tool_inspector_description 0x7f080090
int id tool_inspector_level_view 0x7f080091 int id tool_inspector_imageview 0x7f080091
int id tool_inspector_pricebutton 0x7f080092 int id tool_inspector_level_view 0x7f080092
int id tool_inspector_title 0x7f080093 int id tool_inspector_pricebutton 0x7f080093
int id tool_upgrade_imageview 0x7f080094 int id tool_inspector_title 0x7f080094
int id tool_upgrade_pricebutton 0x7f080095 int id tool_upgrade_imageview 0x7f080095
int id tool_upgrade_title 0x7f080096 int id tool_upgrade_pricebutton 0x7f080096
int id tool_upgrade_value_new 0x7f080097 int id tool_upgrade_title 0x7f080097
int id tool_upgrade_value_old 0x7f080098 int id tool_upgrade_value_new 0x7f080098
int id toolbutton_1 0x7f080099 int id tool_upgrade_value_old 0x7f080099
int id toolbutton_2 0x7f08009a int id toolbutton_1 0x7f08009a
int id toolbutton_3 0x7f08009b int id toolbutton_2 0x7f08009b
int id toolbutton_4 0x7f08009c int id toolbutton_3 0x7f08009c
int id toolofferslot_slot 0x7f08009d int id toolbutton_4 0x7f08009d
int id toolofferslot_title 0x7f08009e int id toolofferslot_slot 0x7f08009e
int id toolshop_slot1 0x7f08009f int id toolofferslot_title 0x7f08009f
int id toolshop_slot2 0x7f0800a0 int id toolshop_slot1 0x7f0800a0
int id toolshop_slot3 0x7f0800a1 int id toolshop_slot2 0x7f0800a1
int id toolshop_slot4 0x7f0800a2 int id toolshop_slot3 0x7f0800a2
int id toolshop_tool_offer_layout 0x7f0800a3 int id toolshop_slot4 0x7f0800a3
int id toolshop_toolinspector 0x7f0800a4 int id toolshop_tool_offer_bottom_row 0x7f0800a4
int id toolshop_topbar 0x7f0800a5 int id toolshop_tool_offer_top_row 0x7f0800a5
int id toolslot_image 0x7f0800a6 int id toolshop_toolinspector 0x7f0800a6
int id topPanel 0x7f0800a7 int id toolshop_topbar 0x7f0800a7
int id topbar_energycount 0x7f0800a8 int id toolslot_image 0x7f0800a8
int id topbar_energycount_decrease 0x7f0800a9 int id topPanel 0x7f0800a9
int id topbar_energyview 0x7f0800aa int id topbar_energycount 0x7f0800aa
int id topbar_layout 0x7f0800ab int id topbar_energycount_decrease 0x7f0800ab
int id topbar_leveldisplay 0x7f0800ac int id topbar_energyview 0x7f0800ac
int id topbar_levellayout 0x7f0800ad int id topbar_layout 0x7f0800ad
int id topbar_levelprogress 0x7f0800ae int id topbar_leveldisplay 0x7f0800ae
int id topbar_settings 0x7f0800af int id topbar_levellayout 0x7f0800af
int id topbar_shapeshop 0x7f0800b0 int id topbar_levelprogress 0x7f0800b0
int id topbar_starcount 0x7f0800b1 int id topbar_settings 0x7f0800b1
int id topbar_starcount_decrease 0x7f0800b2 int id topbar_shapeshop 0x7f0800b2
int id topbar_starview 0x7f0800b3 int id topbar_starcount 0x7f0800b3
int id topbar_toolshop 0x7f0800b4 int id topbar_starcount_decrease 0x7f0800b4
int id tutorial_image_view 0x7f0800b5 int id topbar_starview 0x7f0800b5
int id tutorial_text_view 0x7f0800b6 int id topbar_toolshop 0x7f0800b6
int id unlockmessage_message 0x7f0800b7 int id tutorial_image_view 0x7f0800b7
int id unlockmessage_toolimage 0x7f0800b8 int id tutorial_text_view 0x7f0800b8
int id up 0x7f0800b9 int id unlockmessage_message 0x7f0800b9
int id useLogo 0x7f0800ba int id unlockmessage_toolimage 0x7f0800ba
int id withText 0x7f0800bb int id up 0x7f0800bb
int id worldbutton_energycount 0x7f0800bc int id useLogo 0x7f0800bc
int id worldbutton_levelcount 0x7f0800bd int id withText 0x7f0800bd
int id worldbutton_lock 0x7f0800be int id worldbutton_energycount 0x7f0800be
int id worldbutton_preview 0x7f0800bf int id worldbutton_levelcount 0x7f0800bf
int id worldbutton_starcount 0x7f0800c0 int id worldbutton_lock 0x7f0800c0
int id worldbutton_tickView 0x7f0800c1 int id worldbutton_preview 0x7f0800c1
int id worldbutton_title 0x7f0800c2 int id worldbutton_starcount 0x7f0800c2
int id worlds_layout 0x7f0800c3 int id worldbutton_tickView 0x7f0800c3
int id worlds_topbar 0x7f0800c4 int id worldbutton_title 0x7f0800c4
int id wrap_content 0x7f0800c5 int id worlds_layout 0x7f0800c5
int id worlds_topbar 0x7f0800c6
int id wrap_content 0x7f0800c7
int integer abc_config_activityDefaultDur 0x7f090000 int integer abc_config_activityDefaultDur 0x7f090000
int integer abc_config_activityShortDur 0x7f090001 int integer abc_config_activityShortDur 0x7f090001
int integer abc_max_action_buttons 0x7f090002 int integer abc_max_action_buttons 0x7f090002
@ -794,22 +799,23 @@ int layout select_dialog_multichoice_material 0x7f0a002a
int layout select_dialog_singlechoice_material 0x7f0a002b int layout select_dialog_singlechoice_material 0x7f0a002b
int layout settings 0x7f0a002c int layout settings 0x7f0a002c
int layout shape_button 0x7f0a002d int layout shape_button 0x7f0a002d
int layout shape_shop 0x7f0a002e int layout shape_inspector 0x7f0a002e
int layout short_menu 0x7f0a002f int layout shape_shop 0x7f0a002f
int layout start_screen 0x7f0a0030 int layout short_menu 0x7f0a0030
int layout support_simple_spinner_dropdown_item 0x7f0a0031 int layout start_screen 0x7f0a0031
int layout tool_inspector 0x7f0a0032 int layout support_simple_spinner_dropdown_item 0x7f0a0032
int layout tool_offer_slot 0x7f0a0033 int layout tool_inspector 0x7f0a0033
int layout tool_slot 0x7f0a0034 int layout tool_offer_slot 0x7f0a0034
int layout tool_upgrade 0x7f0a0035 int layout tool_slot 0x7f0a0035
int layout toolbutton 0x7f0a0036 int layout tool_upgrade 0x7f0a0036
int layout toolbuttonbar 0x7f0a0037 int layout toolbutton 0x7f0a0037
int layout toolshop 0x7f0a0038 int layout toolbuttonbar 0x7f0a0038
int layout topbar 0x7f0a0039 int layout toolshop 0x7f0a0039
int layout tutorial 0x7f0a003a int layout topbar 0x7f0a003a
int layout unlock_message 0x7f0a003b int layout tutorial 0x7f0a003b
int layout world_button 0x7f0a003c int layout unlock_message 0x7f0a003c
int layout worlds 0x7f0a003d int layout world_button 0x7f0a003d
int layout worlds 0x7f0a003e
int mipmap ic_launcher 0x7f0b0000 int mipmap ic_launcher 0x7f0b0000
int raw background 0x7f0c0000 int raw background 0x7f0c0000
int raw ramp 0x7f0c0001 int raw ramp 0x7f0c0001

2
app/src/main/java/de/frajul/endlessroll/main/screens/PlayerShapeShopScreen.java
View File

@ -14,7 +14,7 @@ import de.frajul.endlessroll.views.TopBar;
/** /**
* Created by Julian on 08.07.2016. * Created by Julian on 08.07.2016.
*/ */
public class PlayerShapeShopScreen extends Screen<LinearLayout> implements PlayerShapeButtonOnClickListener { public class PlayerShapeShopScreen extends Screen<RelativeLayout> implements PlayerShapeButtonOnClickListener {
private PlayerShapeButton activeButton; private PlayerShapeButton activeButton;

6
app/src/main/res/layout/shape_button.xml
View File

@ -10,12 +10,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:text="@string/placeholder_button" android:text="@string/placeholder_button"
android:textSize="30sp"/> android:textSize="28sp"/>
<Button <Button
android:id="@+id/shape_button_button" android:id="@+id/shape_button_button"
android:layout_width="70dp" android:layout_width="65dp"
android:layout_height="70dp" android:layout_height="65dp"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:background="@drawable/playershapes_ball"/> android:background="@drawable/playershapes_ball"/>

52
app/src/main/res/layout/shape_inspector.xml Normal file
View File

@ -0,0 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="@dimen/shape_inspector_width"
android:layout_height="match_parent"
android:background="#e6ffc936"
android:orientation="vertical"
android:padding="10dp">
<TextView
android:id="@+id/tool_inspector_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="Smiley"
android:textAlignment="center"
android:textSize="28sp"/>
<ImageView
android:id="@+id/tool_inspector_imageview"
android:layout_width="45dp"
android:layout_height="45dp"
android:layout_gravity="center_horizontal"
android:src="@drawable/playershapes_smiley"
android:layout_marginBottom="20dp"/>
<CheckBox
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:text="First task"/>
<CheckBox
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Second task"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/tool_inspector_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="Don't worry - roll happy!"
android:textAlignment="center"
android:textSize="20sp"/>
</RelativeLayout>
</LinearLayout>

78
app/src/main/res/layout/shape_shop.xml
View File

@ -1,55 +1,63 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout 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:background="@drawable/backgrounds_menu_grass" android:background="@drawable/backgrounds_menu_grass">
android:orientation="vertical">
<include <include
android:id="@+id/shape_shop_topbar" android:id="@+id/shape_shop_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_marginBottom="5dp"/>
<LinearLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:layout_below="@id/shape_shop_topbar">
<RelativeLayout <LinearLayout
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_toLeftOf="@id/shape_shop_shape_inspector"
android:orientation="vertical">
<LinearLayout <RelativeLayout
android:id="@+id/shape_shop_topRow" android:layout_width="match_parent"
android:layout_width="wrap_content" android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="match_parent">
android:layout_centerInParent="true"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:orientation="horizontal"/>
</RelativeLayout> <LinearLayout
android:id="@+id/shape_shop_topRow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:orientation="horizontal"/>
<RelativeLayout </RelativeLayout>
android:layout_width="match_parent"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1">
<LinearLayout
android:id="@+id/shape_shop_bottomRow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:orientation="horizontal"/>
</RelativeLayout>
</LinearLayout>
<include
android:id="@+id/shape_shop_shape_inspector"
layout="@layout/shape_inspector"
android:layout_width="@dimen/shape_inspector_width"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1"> android:layout_alignParentEnd="true"/>
<LinearLayout </RelativeLayout>
android:id="@+id/shape_shop_bottomRow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:orientation="horizontal"/>
</RelativeLayout> </RelativeLayout>
</LinearLayout>
</LinearLayout>

3
app/src/main/res/layout/tool_offer_slot.xml
View File

@ -10,7 +10,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/placeholder_textview" android:text="@string/placeholder_textview"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:textSize="25sp"/> android:textAlignment="center"
android:textSize="22sp"/>
<include <include
android:id="@+id/toolofferslot_slot" android:id="@+id/toolofferslot_slot"

4
app/src/main/res/layout/tool_slot.xml
View File

@ -5,8 +5,8 @@
<ImageView <ImageView
android:id="@+id/toolslot_image" android:id="@+id/toolslot_image"
android:layout_width="70dp" android:layout_width="@dimen/tool_button_width"
android:layout_height="70dp" android:layout_height="@dimen/tool_button_height"
android:layout_gravity="center" android:layout_gravity="center"
android:background="@drawable/xml_background_toolslot" android:background="@drawable/xml_background_toolslot"
android:src="@drawable/tools_ramp_button"/> android:src="@drawable/tools_ramp_button"/>

16
app/src/main/res/layout/toolbutton.xml
View File

@ -4,24 +4,24 @@
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<ImageView <ImageView
android:id="@+id/toolProgressBarView" android:id="@+id/tool_button_background_layer"
android:layout_width="70dp" android:layout_width="@dimen/tool_button_width"
android:layout_height="60dp" android:layout_height="@dimen/tool_button_height"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:src="@drawable/tools_ramp_button"/> android:src="@drawable/tools_ramp_button"/>
<ImageView <ImageView
android:id="@+id/toolProgressButtonAnimation" android:id="@+id/tool_button_animation_layer"
android:layout_width="70dp" android:layout_width="@dimen/tool_button_width"
android:layout_height="60dp" android:layout_height="@dimen/tool_button_height"
android:src="@drawable/tools_ramp_button" android:src="@drawable/tools_ramp_button"
android:visibility="invisible"/> android:visibility="invisible"/>
<ProgressBar <ProgressBar
android:id="@+id/toolProgressBar" android:id="@+id/tool_button_progress_bar"
style="@style/Widget.AppCompat.ProgressBar.Horizontal" style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="@dimen/tool_button_height"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:max="100" android:max="100"
android:progress="100" android:progress="100"

33
app/src/main/res/layout/toolshop.xml
View File

@ -22,12 +22,12 @@
android:layout_toStartOf="@+id/toolshop_toolinspector"> android:layout_toStartOf="@+id/toolshop_toolinspector">
<LinearLayout <LinearLayout
android:id="@+id/linearLayout4"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:orientation="horizontal" android:orientation="horizontal">
android:id="@+id/linearLayout4">
<include <include
android:id="@+id/toolshop_slot1" android:id="@+id/toolshop_slot1"
@ -61,22 +61,33 @@
</LinearLayout> </LinearLayout>
<HorizontalScrollView <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_alignParentBottom="true" android:layout_below="@+id/linearLayout4">
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp">
<LinearLayout <LinearLayout
android:id="@+id/toolshop_tool_offer_layout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="2dp" android:layout_centerInParent="true"
android:orientation="horizontal"> android:orientation="vertical">
<LinearLayout
android:id="@+id/toolshop_tool_offer_top_row"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:orientation="horizontal"/>
<LinearLayout
android:id="@+id/toolshop_tool_offer_bottom_row"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"/>
</LinearLayout> </LinearLayout>
</HorizontalScrollView>
</RelativeLayout>
</RelativeLayout> </RelativeLayout>

3
app/src/main/res/values/dimen.xml
View File

@ -1,4 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<dimen name="tool_inspector_width">170dp</dimen> <dimen name="tool_inspector_width">170dp</dimen>
<dimen name="shape_inspector_width">170dp</dimen>
<dimen name="tool_button_width">70dp</dimen>
<dimen name="tool_button_height">60dp</dimen>
</resources> </resources>

2
app/src/main/res/values/strings.xml
View File

@ -61,7 +61,7 @@
<string name="tool_name_spring">Spring</string> <string name="tool_name_spring">Spring</string>
<string name="tool_name_magnet">Magnet</string> <string name="tool_name_magnet">Magnet</string>
<string name="tool_name_bomb">Bomb</string> <string name="tool_name_bomb">Bomb</string>
<string name="tool_name_power_mushroom">Power Mushroom</string> <string name="tool_name_power_mushroom">Mushroom</string>
<string name="tool_level_format_d">Level: %d</string> <string name="tool_level_format_d">Level: %d</string>
<string name="tool_upgrade_title_format_sd">%1$s (Lv%2$d)</string> <string name="tool_upgrade_title_format_sd">%1$s (Lv%2$d)</string>
<string name="tool_upgrade_none">None</string> <string name="tool_upgrade_none">None</string>