Skip to content

Commit

Permalink
Arrreglados pequeños detalles.
Browse files Browse the repository at this point in the history
  • Loading branch information
@marsavela
marsavela committed Nov 9, 2013
1 parent 4e79b7a commit 4398d08
Show file tree
Hide file tree
Showing 9 changed files with 78 additions and 58 deletions.
4 changes: 2 additions & 2 deletions WWTBAM/src/main/java/es/serpat/wwtbam/PlayActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@ public class PlayActivity extends Activity implements OnClickAlertDialogFragment
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.play);
setContentView(R.layout.activity_play);

// Set up action bar.
final ActionBar actionBar = getActionBar();

// Specify that the Home button should show an "Up" caret, indicating that touching the
// button will take the user one step up in the application's hierarchy.
actionBar.setDisplayHomeAsUpEnabled(true);
//actionBar.setDisplayHomeAsUpEnabled(true);

game = new Game(this);

Expand Down
74 changes: 41 additions & 33 deletions WWTBAM/src/main/res/layout-land/play.xml → ...rc/main/res/layout-land/activity_play.xml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:gravity="center">
android:orientation="vertical"
tools:context=".PlayActivity">

<TextView
android:layout_width="fill_parent"
Expand All @@ -26,21 +27,23 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:baselineAligned="false"
android:orientation="horizontal"
android:orientation="vertical"
android:gravity="bottom"
android:layout_weight="0.7">
android:layout_gravity="bottom"
android:layout_weight="2">

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
android:layout_weight="0.5"
android:gravity="bottom">
android:layout_height="match_parent"
android:orientation="horizontal"
android:gravity="bottom"
android:baselineAligned="true"
android:layout_weight="1">

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="0.5">
android:layout_height="match_parent"
android:layout_weight="5">

<TextView
android:layout_width="wrap_content"
Expand All @@ -49,10 +52,11 @@
android:text="A : "
android:id="@+id/textA"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin" />
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_gravity="center_vertical" />

<Button
android:text="@string/low_play"
android:text="dfghdfghdffghdfghdfghdfghdfghsdfgsdfg"
android:id="@+id/butA"
style="@style/buttonColor"
android:background="@drawable/btn_red_matte"
Expand All @@ -63,23 +67,24 @@

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="0.5">
android:layout_height="match_parent"
android:layout_weight="5">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="C : "
android:id="@+id/textC"
android:text="B : "
android:id="@+id/textB"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin" />
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_gravity="center_vertical" />

<Button
android:text="@string/low_scores"
android:id="@+id/butC"
android:text="@string/low_settings"
android:id="@+id/butB"
style="@style/buttonColor"
android:background="@drawable/btn_orange_matte"
android:background="@drawable/btn_blue_matte"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:textSize="20sp"/>
Expand All @@ -90,30 +95,32 @@

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
android:layout_weight="0.5"
android:gravity="bottom">
android:layout_height="match_parent"
android:orientation="horizontal"
android:gravity="bottom"
android:baselineAligned="true"
android:layout_weight="1">

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_height="match_parent"
android:layout_weight="0.5">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="B : "
android:id="@+id/textB"
android:text="C : "
android:id="@+id/textC"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin" />
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_gravity="center_vertical" />

<Button
android:text="@string/low_settings"
android:id="@+id/butB"
android:text="@string/low_scores"
android:id="@+id/butC"
style="@style/buttonColor"
android:background="@drawable/btn_blue_matte"
android:background="@drawable/btn_orange_matte"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:textSize="20sp"/>
Expand All @@ -122,7 +129,7 @@

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_height="match_parent"
android:layout_weight="0.5">

<TextView
Expand All @@ -132,7 +139,8 @@
android:text="D : "
android:id="@+id/textD"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin" />
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_gravity="center_vertical" />

<Button
android:text="@string/low_about"
Expand Down
12 changes: 8 additions & 4 deletions ...M/src/main/res/layout-large-land/play.xml → ...n/res/layout-large-land/activity_play.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
android:id="@+id/textA"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:textStyle="bold" />
android:textStyle="bold"
android:layout_gravity="center_vertical" />

<Button
android:text="@string/low_play"
Expand All @@ -56,7 +57,8 @@
android:id="@+id/textB"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:textStyle="bold" />
android:textStyle="bold"
android:layout_gravity="center_vertical" />

<Button
android:text="@string/low_settings"
Expand All @@ -80,7 +82,8 @@
android:id="@+id/textC"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:textStyle="bold" />
android:textStyle="bold"
android:layout_gravity="center_vertical" />

<Button
android:text="@string/low_scores"
Expand All @@ -104,7 +107,8 @@
android:id="@+id/textD"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:textStyle="bold" />
android:textStyle="bold"
android:layout_gravity="center_vertical" />

<Button
android:text="@string/low_about"
Expand Down
12 changes: 8 additions & 4 deletions WWTBAM/src/main/res/layout-large/play.xml → ...c/main/res/layout-large/activity_play.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
android:id="@+id/textA"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:textStyle="bold" />
android:textStyle="bold"
android:layout_gravity="center_vertical" />

<Button
android:text="@string/low_play"
Expand All @@ -55,7 +56,8 @@
android:id="@+id/textB"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:textStyle="bold" />
android:textStyle="bold"
android:layout_gravity="center_vertical" />

<Button
android:text="@string/low_settings"
Expand All @@ -79,7 +81,8 @@
android:id="@+id/textC"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:textStyle="bold" />
android:textStyle="bold"
android:layout_gravity="center_vertical" />

<Button
android:text="@string/low_scores"
Expand All @@ -103,7 +106,8 @@
android:id="@+id/textD"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:textStyle="bold" />
android:textStyle="bold"
android:layout_gravity="center_vertical" />

<Button
android:text="@string/low_about"
Expand Down
12 changes: 8 additions & 4 deletions WWTBAM/src/main/res/layout/play.xml → WWTBAM/src/main/res/layout/activity_play.xml
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
android:text="A : "
android:id="@+id/textA"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin" />
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_gravity="center_vertical" />

<Button
android:text="@string/low_play"
Expand All @@ -60,7 +61,8 @@
android:text="B : "
android:id="@+id/textB"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin" />
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_gravity="center_vertical" />

<Button
android:text="@string/low_settings"
Expand All @@ -83,7 +85,8 @@
android:text="C : "
android:id="@+id/textC"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin" />
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_gravity="center_vertical" />

<Button
android:text="@string/low_scores"
Expand All @@ -106,7 +109,8 @@
android:text="D : "
android:id="@+id/textD"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin" />
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_gravity="center_vertical" />

<Button
android:text="@string/low_about"
Expand Down
10 changes: 5 additions & 5 deletions WWTBAM/src/main/res/values-es/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<string name="pref_name_title">Nombre</string>
<string name="pref_title_help">Número de ayudas</string>
<string name="right">BIEN HECHO</string>
<string name="right_message">Concéntrese. Siga adelante. Qué quiere hacer?</string>
<string name="right_message">Concéntrese. Siga adelante. ¿Qué quiere hacer?</string>
<string name="scores">PUNTUACIONES</string>
<string name="settings">OPCIONES</string>
<string name="sorry">SE SIENTE</string>
Expand All @@ -52,9 +52,9 @@
<string name="attention">Atención</string>
<string name="start_new_game_message">Estás en medio de una partida. Si cambias ahora las preferencias, perderás la puta partida.</string>
<string name="not_connected">El dispositivo no está conectado a Internet.</string>
<string name="current_player">Jugador Actual: </string>
<string name="added">added to your friends!</string>
<string name="cancel">CANCEL</string>
<string name="insert_friend">Enter your friend\'s name</string>
<string name="current_player">Jugador Actual:\u0020</string>
<string name="added">\u0020ha sido añadido a tus amigos!</string>
<string name="cancel">CANCELAR</string>
<string name="insert_friend">Escribe el nombre de tu amigo</string>

</resources>
6 changes: 3 additions & 3 deletions WWTBAM/src/main/res/values-pt/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
<string name="users">TODOS OS USUARIOS</string>
<string name="yes">SIM</string>
<string name="you_lost">Perdeu</string>
<string name="current_player">Jogador Actual: </string>
<string name="added">added to your friends!</string>
<string name="cancel">CANCEL</string>
<string name="current_player">Jogador Actual:\u0020</string>
<string name="added">\u0020added to your friends!</string>
<string name="cancel">CANCELAR</string>
<string name="insert_friend">Enter your friend\'s name</string>

</resources>
4 changes: 2 additions & 2 deletions WWTBAM/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@
<string name="not_connected">The device is not connected to the Internet.</string>
<string name="logo">Logo</string>
<string name="empty_face">Empty face</string>
<string name="current_player">Current Player: </string>
<string name="added">added to your friends!</string>
<string name="current_player">Current Player:\u0020</string>
<string name="added">\u0020added to your friends!</string>
<string name="cancel">CANCEL</string>
<string name="insert_friend">Enter your friend\'s name</string>

Expand Down
2 changes: 1 addition & 1 deletion WWTBAM/src/main/res/values/styles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<item name="android:textColor">#ffffff</item>
<item name="android:gravity">center</item>
<item name="android:layout_margin">3dp</item>
<item name="android:textSize">30sp</item>
<item name="android:textSize">25sp</item>
<item name="android:shadowColor">#000000</item>
<item name="android:shadowDx">1</item>
<item name="android:shadowDy">1</item>
Expand Down

0 comments on commit 4398d08

Please sign in to comment.