Changed particle effects

Message renamed to GameOverMessage + improved look
Added first implementation of GoalScreen
Cleaned up and improved look of levelButton, worldButton and their screens
This commit is contained in:
=
2017-11-04 17:28:46 +01:00
parent 4e758353b8
commit 8d4caeaf69
37 changed files with 825 additions and 689 deletions

View File

@@ -1,115 +1,93 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="260dp"
android:layout_height="match_parent"
android:background="@drawable/xml_background_worldbutton">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/xml_background_worldbutton"
android:orientation="vertical"
android:padding="15dp">
<TextView
android:id="@+id/worldbutton_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:text="@string/world_button_title_placeholder"
android:textColor="#ff2200"
android:textSize="30sp"
android:textStyle="bold|italic"/>
<ImageView
android:id="@+id/worldbutton_preview"
android:layout_height="wrap_content"
android:layout_below="@+id/worldbutton_title"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:adjustViewBounds="true"
android:src="@drawable/world_previews_grass"
android:layout_width="150dp"/>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
android:layout_alignParentStart="true">
<TextView
android:id="@+id/worldbutton_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/world_button_title_placeholder"
android:textColor="#ff2200"
android:textSize="30sp"/>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true">
android:layout_gravity="center_horizontal">
<ImageView
android:id="@+id/worldbutton_preview"
android:layout_width="150dp"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginTop="10dp"
android:adjustViewBounds="true"
android:src="@drawable/world_previews_grass"/>
<ImageView
android:id="@+id/worldbutton_lock"
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_centerInParent="true"
android:src="@drawable/guis_lock_locked"
android:visibility="visible"/>
</RelativeLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="horizontal">
<ImageView
android:id="@+id/worldbutton_tickView"
android:layout_width="30sp"
android:layout_height="30sp"
android:layout_alignParentStart="true"
android:layout_gravity="center_vertical"
android:src="@drawable/guis_tick"/>
<TextView
android:id="@+id/worldbutton_levelcount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginEnd="10dp"
android:text="@string/world_button_progress_placeholder"
android:textSize="20sp"
android:textStyle="bold"
android:layout_centerVertical="true"
android:layout_toRightOf="@+id/worldbutton_tickView"
android:layout_toEndOf="@+id/worldbutton_tickView"
android:layout_marginRight="10dp"/>
android:textSize="20sp"/>
<ImageView
android:id="@+id/levelbutton_starView"
android:layout_width="30sp"
android:layout_height="30sp"
android:layout_centerVertical="true"
android:layout_toRightOf="@+id/worldbutton_levelcount"
android:layout_toEndOf="@+id/worldbutton_levelcount"
android:layout_gravity="center_vertical"
android:src="@drawable/currency_star"/>
<TextView
android:id="@+id/worldbutton_starcount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/levelbutton_starView"
android:layout_toRightOf="@+id/levelbutton_starView"
android:layout_gravity="center_vertical"
android:layout_marginEnd="10dp"
android:text="@string/world_button_progress_placeholder"
android:textSize="20sp"
android:textStyle="bold"
android:layout_marginRight="10dp"/>
android:textSize="20sp"/>
<ImageView
android:layout_width="30sp"
android:layout_height="30sp"
android:layout_gravity="center_vertical"
android:src="@drawable/currency_energy"/>
<TextView
android:id="@+id/worldbutton_energycount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/imageView4"
android:layout_toRightOf="@+id/imageView4"
android:layout_gravity="center_vertical"
android:text="@string/world_button_progress_placeholder"
android:textSize="20sp"
android:textStyle="bold"/>
android:textSize="20sp"/>
<ImageView
android:id="@+id/imageView4"
android:layout_width="30sp"
android:layout_height="30sp"
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/worldbutton_starcount"
android:layout_toRightOf="@+id/worldbutton_starcount"
android:src="@drawable/currency_energy"/>
</LinearLayout>
</RelativeLayout>
</RelativeLayout>
<ImageView
android:id="@+id/worldbutton_lock"
android:layout_width="150dp"
android:layout_height="150dp"
android:src="@drawable/guis_lock_locked"
android:visibility="visible"
android:layout_alignBottom="@+id/worldbutton_preview"
android:layout_alignLeft="@+id/worldbutton_preview"
android:layout_alignStart="@+id/worldbutton_preview"/>
</RelativeLayout>
</LinearLayout>