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

Redid message -> no more buttons but clickable textviews

Browse Source
This commit is contained in:
= 2017-08-02 12:33:57 +02:00
parent 373d7779d1
commit 50cbdb6688
7 changed files with 117 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build/intermediates/blame/res/debug/single/anim.json
View File

@ -59,6 +59,10 @@
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_slide_in_top.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\anim\\abc_slide_in_top.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\anim\\pulse.xml",
"source": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\src\\main\\res\\anim\\pulse.xml"
},
{
"merged": "C:\\Users\\Julian\\AndroidStudioProjects\\EndlessRoll\\app\\build\\intermediates\\res\\merged\\debug\\anim\\abc_slide_in_bottom.xml",
"source": "C:\\Users\\Julian\\.android\\build-cache\\2232000db64551c7682d41127fbc27c912efcc3d\\output\\res\\anim\\abc_slide_in_bottom.xml"

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

File diff suppressed because one or more lines are too long

85
app/build/intermediates/res/merged/debug/layout/message.xml
View File

@ -12,52 +12,55 @@
android:layout_centerHorizontal="true"
android:textSize="55sp"/>
<Button
android:id="@+id/message_nextlevelbutton"
style="@style/GameButton"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/message_title"
android:layout_toLeftOf="@+id/message_title"
android:layout_toStartOf="@+id/message_title"
android:text="Next level"/>
<Button
android:id="@+id/message_exitbutton"
style="@style/GameButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="To menu"
android:layout_alignBaseline="@+id/message_restartbutton"
android:layout_alignBottom="@+id/message_restartbutton"
android:layout_alignLeft="@+id/message_toolshopbutton"
android:layout_alignStart="@+id/message_toolshopbutton"/>
<Button
android:id="@+id/message_toolshopbutton"
style="@style/GameButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="21dp"
android:layout_marginStart="21dp"
android:text="Tools"
android:orientation="horizontal"
android:layout_above="@+id/message_title"
android:layout_toRightOf="@+id/message_title"
android:layout_toEndOf="@+id/message_title"
android:layout_marginBottom="14dp"/>
android:layout_centerHorizontal="true">
<Button
android:id="@+id/message_restartbutton"
style="@style/GameButton"
<TextView
android:id="@+id/message_tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="200dp"
android:text="Tools"
android:textColor="#daf10d"
android:textSize="40sp"/>
<TextView
android:id="@+id/message_to_menu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="To menu"
android:textColor="#daf10d"
android:textSize="40sp"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_marginTop="20dp"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/message_title"
android:layout_alignParentBottom="true"
android:layout_alignStart="@+id/message_title"
android:layout_marginBottom="14dp"
android:layout_marginLeft="50dp"
android:layout_marginStart="50dp"
android:text="Restart level"
android:visibility="visible"/>
android:orientation="horizontal"
android:layout_below="@+id/message_title"
android:layout_centerHorizontal="true">
<TextView
android:id="@+id/message_restart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Restart"
android:textColor="#daf10d"
android:textSize="40sp"
android:layout_marginEnd="120dp"/>
<TextView
android:id="@+id/message_next_level"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Next level"
android:textColor="#daf10d"
android:textSize="40sp"/>
</LinearLayout>
</RelativeLayout>

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

Binary file not shown.

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

@ -12,12 +12,13 @@ int anim countdown 0x7f05000a
int anim decrease 0x7f05000b
int anim fade_in 0x7f05000c
int anim fade_out 0x7f05000d
int anim rotate 0x7f05000e
int anim scale_up 0x7f05000f
int anim shrink 0x7f050010
int anim slide_in_left 0x7f050011
int anim slide_in_right 0x7f050012
int anim slide_in_top 0x7f050013
int anim pulse 0x7f05000e
int anim rotate 0x7f05000f
int anim scale_up 0x7f050010
int anim shrink 0x7f050011
int anim slide_in_left 0x7f050012
int anim slide_in_right 0x7f050013
int anim slide_in_top 0x7f050014
int attr actionBarDivider 0x7f010063
int attr actionBarItemBackground 0x7f010064
int attr actionBarPopupTheme 0x7f01005d
@ -601,11 +602,11 @@ int id linearLayout4 0x7f0d009c
int id listMode 0x7f0d0009
int id list_item 0x7f0d0028
int id media_actions 0x7f0d006f
int id message_exitbutton 0x7f0d0069
int id message_nextlevelbutton 0x7f0d0068
int id message_restartbutton 0x7f0d006a
int id message_next_level 0x7f0d006b
int id message_restart 0x7f0d006a
int id message_title 0x7f0d0067
int id message_toolshopbutton 0x7f0d006b
int id message_to_menu 0x7f0d0069
int id message_tools 0x7f0d0068
int id middle 0x7f0d001a
int id multiply 0x7f0d0013
int id never 0x7f0d001e

13
app/src/main/res/anim/pulse.xml Normal file
View File

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<set xmlns:android="http://schemas.android.com/apk/res/android"
android:repeatMode="reverse">
<scale
android:duration="1000"
android:fromXScale="1.2"
android:fromYScale="1.2"
android:repeatCount="infinite"
android:pivotX="50%"
android:pivotY="50%"
android:toXScale="0.8"
android:toYScale="0.8" />
</set>

85
app/src/main/res/layout/message.xml
View File

@ -12,52 +12,55 @@
android:layout_centerHorizontal="true"
android:textSize="55sp"/>
<Button
android:id="@+id/message_nextlevelbutton"
style="@style/GameButton"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/message_title"
android:layout_toLeftOf="@+id/message_title"
android:layout_toStartOf="@+id/message_title"
android:text="Next level"/>
<Button
android:id="@+id/message_exitbutton"
style="@style/GameButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="To menu"
android:layout_alignBaseline="@+id/message_restartbutton"
android:layout_alignBottom="@+id/message_restartbutton"
android:layout_alignLeft="@+id/message_toolshopbutton"
android:layout_alignStart="@+id/message_toolshopbutton"/>
<Button
android:id="@+id/message_toolshopbutton"
style="@style/GameButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="21dp"
android:layout_marginStart="21dp"
android:text="Tools"
android:orientation="horizontal"
android:layout_above="@+id/message_title"
android:layout_toRightOf="@+id/message_title"
android:layout_toEndOf="@+id/message_title"
android:layout_marginBottom="14dp"/>
android:layout_centerHorizontal="true">
<Button
android:id="@+id/message_restartbutton"
style="@style/GameButton"
<TextView
android:id="@+id/message_tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="200dp"
android:text="Tools"
android:textColor="#daf10d"
android:textSize="40sp"/>
<TextView
android:id="@+id/message_to_menu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="To menu"
android:textColor="#daf10d"
android:textSize="40sp"/>
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_marginTop="20dp"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/message_title"
android:layout_alignParentBottom="true"
android:layout_alignStart="@+id/message_title"
android:layout_marginBottom="14dp"
android:layout_marginLeft="50dp"
android:layout_marginStart="50dp"
android:text="Restart level"
android:visibility="visible"/>
android:orientation="horizontal"
android:layout_below="@+id/message_title"
android:layout_centerHorizontal="true">
<TextView
android:id="@+id/message_restart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Restart"
android:textColor="#daf10d"
android:textSize="40sp"
android:layout_marginEnd="120dp"/>
<TextView
android:id="@+id/message_next_level"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Next level"
android:textColor="#daf10d"
android:textSize="40sp"/>
</LinearLayout>
</RelativeLayout>