| |
@@ -13,31 +13,44 @@ |
| 13 |
13 |
|
android:layout_alignParentLeft="true" |
| 14 |
14 |
|
android:layout_alignParentRight="true" |
| 15 |
15 |
|
android:layout_alignParentTop="true" |
| 16 |
|
- |
android:scaleType="centerCrop" /> |
| |
16 |
+ |
android:scaleType="centerCrop" |
| |
17 |
+ |
android:src="@drawable/credits" /> |
| 17 |
18 |
|
|
| 18 |
19 |
|
<LinearLayout |
| 19 |
20 |
|
android:id="@+id/storyContainer" |
| 20 |
21 |
|
android:layout_width="match_parent" |
| 21 |
22 |
|
android:layout_height="wrap_content" |
| 22 |
23 |
|
android:layout_alignParentBottom="true" |
| 23 |
|
- |
android:background="@drawable/story_background" |
| |
24 |
+ |
android:background="@drawable/bottom_background" |
| 24 |
25 |
|
android:orientation="horizontal" > |
| 25 |
26 |
|
|
| 26 |
|
- |
<TextView |
| 27 |
|
- |
android:id="@+id/text" |
| 28 |
|
- |
style="@style/TextWithShadow" |
| 29 |
|
- |
android:layout_width="wrap_content" |
| |
27 |
+ |
<ScrollView |
| |
28 |
+ |
android:layout_width="0dp" |
| 30 |
29 |
|
android:layout_height="wrap_content" |
| 31 |
30 |
|
android:layout_gravity="bottom" |
| 32 |
31 |
|
android:layout_weight="1" |
| 33 |
|
- |
android:linksClickable="false" |
| |
32 |
+ |
android:orientation="vertical" |
| 34 |
33 |
|
android:paddingBottom="@dimen/activity_vertical_margin" |
| 35 |
34 |
|
android:paddingLeft="@dimen/activity_horizontal_margin" |
| 36 |
35 |
|
android:paddingRight="@dimen/activity_horizontal_margin" |
| 37 |
|
- |
android:paddingTop="@dimen/activity_vertical_margin" |
| 38 |
|
- |
android:text="Ciao\nBastarto!" |
| 39 |
|
- |
android:textColor="@android:color/white" |
| 40 |
|
- |
android:textSize="@dimen/storyText" /> |
| |
36 |
+ |
android:paddingTop="@dimen/activity_vertical_margin" > |
| |
37 |
+ |
|
| |
38 |
+ |
<TextView |
| |
39 |
+ |
android:id="@+id/text" |
| |
40 |
+ |
style="@style/TextWithShadow" |
| |
41 |
+ |
android:layout_width="match_parent" |
| |
42 |
+ |
android:layout_height="wrap_content" |
| |
43 |
+ |
android:background="@drawable/bottom_background" |
| |
44 |
+ |
android:linksClickable="false" |
| |
45 |
+ |
android:paddingBottom="@dimen/activity_vertical_margin" |
| |
46 |
+ |
android:paddingLeft="@dimen/activity_horizontal_margin" |
| |
47 |
+ |
android:paddingRight="@dimen/activity_horizontal_margin" |
| |
48 |
+ |
android:paddingTop="@dimen/activity_vertical_margin" |
| |
49 |
+ |
android:scrollbars="none" |
| |
50 |
+ |
android:text="Ciao\nBastarto!" |
| |
51 |
+ |
android:textColor="@android:color/white" |
| |
52 |
+ |
android:textSize="@dimen/storyText" /> |
| |
53 |
+ |
</ScrollView> |
| 41 |
54 |
|
|
| 42 |
55 |
|
<LinearLayout |
| 43 |
56 |
|
android:id="@+id/buttons" |
| |
@@ -62,13 +75,13 @@ |
| 62 |
75 |
|
|
| 63 |
76 |
|
<Button |
| 64 |
77 |
|
android:id="@+id/creditsButton" |
| 65 |
|
- |
style="@style/TextWithShadow" |
| |
78 |
+ |
style="@style/ButtonWithShadow" |
| 66 |
79 |
|
android:layout_width="wrap_content" |
| 67 |
80 |
|
android:layout_height="wrap_content" |
| 68 |
81 |
|
android:layout_alignParentRight="true" |
| 69 |
82 |
|
android:layout_marginRight="@dimen/activity_horizontal_margin" |
| 70 |
83 |
|
android:layout_marginTop="@dimen/activity_vertical_margin" |
| 71 |
|
- |
android:maxWidth="300dp" |
| |
84 |
+ |
android:maxWidth="@dimen/buttonMaxWidth" |
| 72 |
85 |
|
android:text="@string/creditsButton" |
| 73 |
86 |
|
android:textSize="@dimen/storyText" /> |
| 74 |
87 |
|
|
View this file contents
View the full history
Commits for