Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
@AdrianGJ
AdrianGJ committed Oct 25, 2014
2 parents d3fb2f7 + b2f9bfc commit ff05176
Show file tree
Hide file tree
Showing 4 changed files with 81 additions and 64 deletions.
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_compra.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
android:layout_height="fill_parent"
android:text="COMPRAR"
android:id="@+id/button"
style="@style/ButtonStyle"

/>
</LinearLayout>

Expand Down
102 changes: 61 additions & 41 deletions app/src/main/res/layout/activity_login.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,53 +19,73 @@
android:layout_height="fill_parent"
android:gravity="center">

<TextView
android:layout_width="match_parent"
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Usuario"
android:id="@+id/textView"
android:gravity="center" />
android:layout_gravity="right"
android:gravity="right">

<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/editText"
android:layout_gravity="center_horizontal" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Usuario"
android:id="@+id/textView"
android:gravity="center|right"
android:layout_gravity="right" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Contraseña"
android:id="@+id/textView2"
android:layout_gravity="center_horizontal" />
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/editText"
android:layout_gravity="center_horizontal" />
</LinearLayout>

<EditText
android:layout_width="match_parent"
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:ems="10"
android:id="@+id/editText2"
android:layout_gravity="center_horizontal" />
android:gravity="right"
android:layout_gravity="right">

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Entrar"
android:id="@+id/entrar"
android:layout_gravity="center_horizontal"
style="@style/ButtonStyle"
/>

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Registrarse"
android:id="@+id/button2"
android:layout_gravity="center_horizontal"
style="@style/ButtonStyle"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Contraseña"
android:id="@+id/textView2"
android:layout_gravity="center_horizontal" />

<EditText
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:ems="10"
android:id="@+id/editText2"
android:layout_gravity="center_horizontal" />
</LinearLayout>

<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:gravity="center_horizontal">

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Entrar"
android:id="@+id/entrar"
android:layout_gravity="center_horizontal" />

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Registrarse"
android:id="@+id/button2"
android:layout_gravity="center_horizontal" />
</LinearLayout>

</LinearLayout>

Expand Down
38 changes: 19 additions & 19 deletions app/src/main/res/layout/activity_product.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,54 +49,54 @@
android:layout_gravity="center" />

<GridLayout
android:layout_width="wrap_content"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_gravity="top|center"
android:layout_gravity="top|center_horizontal"
android:columnCount="4"
android:rowCount="4"
android:layout_marginLeft="25dp"
android:layout_marginTop="100dp">
android:layout_marginTop="20dp"
android:layout_marginLeft="15dp">

<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_width="150dp"
android:layout_height="75dp"
android:text="Opiniones"
android:id="@+id/button"
android:layout_row="1"
android:layout_column="1"
style="@style/ButtonStyle"
/>

android:layout_gravity="center_horizontal" />

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="150dp"
android:layout_height="75dp"
android:text="Añadir al carro"
android:id="@+id/button2"
android:layout_gravity="right"
android:layout_row="2"
android:layout_column="1"
style="@style/ButtonStyle"

/>

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Juega"
android:layout_width="150dp"
android:layout_height="75dp"
android:text="Descuentos"
android:id="@+id/button3"
android:layout_row="1"
android:layout_column="2"
android:width="2dp"
style="@style/ButtonStyle"
/>

android:layout_gravity="center_horizontal" />

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="150dp"
android:layout_height="75dp"
android:text="Follow"
android:id="@+id/button4"
android:layout_row="2"
android:layout_column="2"
style="@style/ButtonStyle"

/>
</GridLayout>
</LinearLayout>
Expand Down
3 changes: 0 additions & 3 deletions app/src/main/res/values/styles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,5 @@
<item name="android:dropDownListViewStyle">@style/DropDownListView.Example</item>
</style>

<style name="ButtonStyle" parent="android:Theme.Light">
<item name="android:background">@color/red</item>
</style>

</resources>

0 comments on commit ff05176

Please sign in to comment.