Added settings screen, even if the look has to be polished and new items have to be added
The toolshop-button and the settings-button in the topBar now consist of icons (no text). Bad thing is, that the 'disabled' state doesn't look that good Every screen is given its caller when flipped to. At OnBackKeyDown you can now either 'flipToCaller()' or 'flipToPreviousScreenInTree()' or as you wish...
This commit is contained in:
@ -3,16 +3,14 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<ToggleButton
|
||||
android:id="@+id/startscreen_sound"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignEnd="@+id/startscreen_play"
|
||||
<Button
|
||||
android:id="@+id/startscreen_settings"
|
||||
android:layout_width="50dp"
|
||||
android:layout_height="50dp"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_alignRight="@+id/startscreen_play"
|
||||
android:background="@drawable/xml_selector_sound"
|
||||
android:textOff=""
|
||||
android:textOn=""/>
|
||||
android:background="@drawable/xml_selector_settingsbutton"
|
||||
android:layout_marginBottom="15dp"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/startscreen_play"
|
||||
|
@ -14,8 +14,8 @@
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginEnd="20dp"
|
||||
android:layout_marginStart="5dp"
|
||||
android:orientation="vertical"
|
||||
android:clipChildren="false">
|
||||
android:clipChildren="false"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/topbar_leveldisplay"
|
||||
@ -42,15 +42,15 @@
|
||||
android:background="@drawable/currency_star"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/topbar_energyview"
|
||||
android:layout_width="40dp"
|
||||
android:layout_height="40dp"
|
||||
android:background="@drawable/currency_energy"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_toRightOf="@+id/topbar_starcount"
|
||||
android:layout_toEndOf="@+id/topbar_starcount"
|
||||
android:layout_marginLeft="20dp"
|
||||
android:layout_marginStart="20dp"
|
||||
android:id="@+id/topbar_energyview"/>
|
||||
android:layout_toEndOf="@+id/topbar_starcount"
|
||||
android:layout_toRightOf="@+id/topbar_starcount"
|
||||
android:background="@drawable/currency_energy"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/topbar_starcount"
|
||||
@ -70,59 +70,44 @@
|
||||
android:text="@string/number_placeholder"
|
||||
android:textSize="25sp"/>
|
||||
|
||||
<ToggleButton
|
||||
android:id="@+id/topbar_soundtoggle"
|
||||
android:layout_width="50dp"
|
||||
android:layout_height="50dp"
|
||||
android:layout_alignParentTop="true"
|
||||
<Button
|
||||
android:id="@+id/topbar_settings"
|
||||
android:layout_width="35dp"
|
||||
android:layout_height="35dp"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_margin="5dp"
|
||||
android:layout_marginRight="20dp"
|
||||
android:layout_toLeftOf="@+id/topbar_toolshop"
|
||||
android:layout_toStartOf="@+id/topbar_toolshop"
|
||||
android:background="@drawable/xml_selector_sound"
|
||||
android:textOff=""
|
||||
android:textOn=""/>
|
||||
android:background="@drawable/xml_selector_settingsbutton"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/topbar_toolshop"
|
||||
style="@style/GameButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="40dp"
|
||||
android:layout_height="40dp"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginRight="5dp"
|
||||
android:text="@string/topbar_toolshop"/>
|
||||
android:background="@drawable/xml_selector_shopbutton"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/topbar_starcount_decrease"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/number_placeholder"
|
||||
android:visibility="invisible"
|
||||
android:textSize="20sp"
|
||||
android:layout_alignEnd="@+id/topbar_starcount"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_alignEnd="@+id/topbar_starcount"/>
|
||||
android:text="@string/number_placeholder"
|
||||
android:textSize="20sp"
|
||||
android:visibility="invisible"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/topbar_energycount_decrease"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/number_placeholder"
|
||||
android:visibility="invisible"
|
||||
android:textSize="20sp"
|
||||
android:layout_alignEnd="@+id/topbar_energycount"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_alignEnd="@+id/topbar_energycount"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/topbar_resetButton"
|
||||
style="@style/GameButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/topbar_reset"
|
||||
android:layout_marginLeft="64dp"
|
||||
android:layout_marginStart="64dp"
|
||||
android:layout_alignBaseline="@+id/topbar_soundtoggle"
|
||||
android:layout_alignBottom="@+id/topbar_soundtoggle"
|
||||
android:layout_toRightOf="@+id/topbar_energycount"
|
||||
android:layout_toEndOf="@+id/topbar_energycount"/>
|
||||
android:text="@string/number_placeholder"
|
||||
android:textSize="20sp"
|
||||
android:visibility="invisible"/>
|
||||
|
||||
</RelativeLayout>
|
@ -257,6 +257,7 @@
|
||||
<string name="pre_start_screen_loading">LOADING...</string>
|
||||
<string name="price_button_buy">Buy</string>
|
||||
<string name="price_button_upgrade">Upgrade</string>
|
||||
<string name="settings_reset">Reset</string>
|
||||
<string name="short_menu_continue">Continue</string>
|
||||
<string name="short_menu_exit">Exit</string>
|
||||
<string name="short_menu_restart">Restart</string>
|
||||
@ -280,7 +281,6 @@
|
||||
<string name="tool_upgrade_value_max">Max.</string>
|
||||
<string name="topbar_level_format_d">Level: %d</string>
|
||||
<string name="topbar_level_placeholder">Level: 24</string>
|
||||
<string name="topbar_reset">Reset</string>
|
||||
<string name="topbar_toolshop">Toolshop</string>
|
||||
<string name="tutorial_leveled_up">Congratulations!!!\nYou have leveled up!</string>
|
||||
<string name="tutorial_place_ramp_air">You can even set a Tool in mid-air.\nTry it out!</string>
|
||||
|
Binary file not shown.
Reference in New Issue
Block a user