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

LevelButton + WorldButton energy now shown

Browse Source 
created drawable for empty_energy
redraw star drawable
tick for completed levels on worldButton
This commit is contained in:
=
2017-02-21 16:00:31 +01:00
parent f252bfd4bd
commit 5be4fc05cb
26 changed files with 484 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build/intermediates/res/merged/debug/layout/game.xml
View File

@ -6,8 +6,8 @@
<ImageView
android:id="@+id/game_pausebutton"
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_width="30dp"
android:layout_height="30dp"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"

13
app/build/intermediates/res/merged/debug/layout/levelbutton.xml
View File

@ -24,24 +24,31 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/star_empty"
android:src="@drawable/currency_star_empty"
android:id="@+id/levelbutton_star1"
android:layout_weight="1" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/star_empty"
android:src="@drawable/currency_star_empty"
android:id="@+id/levelbutton_star2"
android:layout_weight="1" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/star_empty"
android:src="@drawable/currency_star_empty"
android:id="@+id/levelbutton_star3"
android:layout_weight="1" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/currency_energy_empty"
android:id="@+id/levelbutton_energy"
android:layout_weight="1" />
</LinearLayout>
<ImageView

135
app/build/intermediates/res/merged/debug/layout/world_button.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="220dp"
android:layout_width="260dp"
android:layout_height="match_parent"
android:background="@drawable/xml_worldbutton_background">
@ -17,76 +17,103 @@
<ImageView
android:id="@+id/worldbutton_preview"
android:layout_width="150dp"
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/previews_grass" />
<ImageView
android:id="@+id/worldbutton_lock"
android:layout_width="150dp"
android:layout_height="150dp"
android:layout_alignBottom="@+id/worldbutton_preview"
android:layout_alignLeft="@+id/worldbutton_preview"
android:layout_alignStart="@+id/worldbutton_preview"
android:src="@drawable/lock_locked"
android:visibility="visible" />
android:src="@drawable/previews_grass"
android:layout_width="150dp" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_marginRight="25dp"
android:layout_marginLeft="25dp">
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
android:layout_alignParentStart="true">
<TextView
android:id="@+id/worldbutton_levelcount"
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="9/35"
android:textColor="#000000"
android:textSize="20sp"
android:textStyle="bold"
android:layout_centerVertical="true"
android:layout_toRightOf="@+id/imageView3"
android:layout_toEndOf="@+id/imageView3" />
android:layout_centerHorizontal="true">
<TextView
android:id="@+id/worldbutton_starcount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="7/105"
android:textColor="#000000"
android:textSize="20sp"
android:textStyle="bold" />
<ImageView
android:id="@+id/worldbutton_tickView"
android:layout_width="30sp"
android:layout_height="30sp"
android:layout_alignParentStart="true"
android:src="@drawable/tick" />
<ImageView
android:layout_width="30sp"
android:layout_height="30sp"
android:layout_centerVertical="true"
android:layout_marginRight="4dp"
android:layout_toLeftOf="@+id/worldbutton_starcount"
android:layout_toStartOf="@+id/worldbutton_starcount"
android:src="@drawable/currency_star"
android:id="@+id/imageView2" />
<TextView
android:id="@+id/worldbutton_levelcount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="9/35"
android:textColor="#000000"
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"/>
<ImageView
android:layout_width="30sp"
android:layout_height="30sp"
android:src="@drawable/lock_unlocked"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:id="@+id/imageView3" />
<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: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:text="7/105"
android:textColor="#000000"
android:textSize="20sp"
android:textStyle="bold"
android:layout_marginRight="10dp"/>
<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:text="9/35"
android:textColor="#000000"
android:textSize="20sp"
android:textStyle="bold" />
<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" />
</RelativeLayout>
</RelativeLayout>
<ImageView
android:id="@+id/worldbutton_lock"
android:layout_width="150dp"
android:layout_height="150dp"
android:src="@drawable/lock_locked"
android:visibility="visible"
android:layout_alignBottom="@+id/worldbutton_preview"
android:layout_alignLeft="@+id/worldbutton_preview"
android:layout_alignStart="@+id/worldbutton_preview" />
</RelativeLayout>

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

Binary file not shown.