Skip to content

Commit

Permalink
cbotones
Browse files Browse the repository at this point in the history
  • Loading branch information
@jiep
jiep committed Oct 25, 2014
1 parent 60cad7a commit 2d9caa8
Show file tree
Hide file tree
Showing 5 changed files with 92 additions and 71 deletions.
8 changes: 4 additions & 4 deletions app/app.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,22 @@
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
Expand All @@ -79,8 +79,8 @@
</content>
<orderEntry type="jdk" jdkName="Android API 20 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="support-v4-20.0.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-20.0.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-20.0.0" level="project" />
</component>
</module>

4 changes: 3 additions & 1 deletion app/src/main/res/layout/activity_compra.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:text="COMPRAR"
android:id="@+id/button" />
android:id="@+id/button"
style="@style/ButtonStyle"
/>
</LinearLayout>

</LinearLayout>
Expand Down
8 changes: 6 additions & 2 deletions app/src/main/res/layout/activity_login.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,18 @@
android:layout_height="wrap_content"
android:text="Entrar"
android:id="@+id/entrar"
android:layout_gravity="center_horizontal" />
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" />
android:layout_gravity="center_horizontal"
style="@style/ButtonStyle"
/>

</LinearLayout>

Expand Down
139 changes: 75 additions & 64 deletions app/src/main/res/layout/activity_product.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,77 +18,88 @@
android:layout_height="fill_parent"
android:id="@+id/scrollView" >

<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
</ScrollView>

<TextView
<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_gravity="center">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Large Text"
android:id="@+id/nombre"
android:layout_gravity="center" />

<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/imageView"
android:layout_gravity="center" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="Medium Text"
android:id="@+id/desc"
android:layout_gravity="center" />

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

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

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Large Text"
android:id="@+id/nombre"
android:layout_gravity="center" />

<ImageView
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:id="@+id/imageView"
android:layout_gravity="center" />

<TextView
android:text="Juega"
android:id="@+id/button3"
android:layout_row="1"
android:layout_column="2"
android:width="2dp"
style="@style/ButtonStyle"
/>

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="Medium Text"
android:id="@+id/desc"
android:layout_gravity="center" />

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

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Opiniones"
android:id="@+id/button"
android:layout_row="1"
android:layout_column="1" />

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

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Juega"
android:id="@+id/button3"
android:layout_row="1"
android:layout_column="2" />

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Follow"
android:id="@+id/button4"
android:layout_row="2"
android:layout_column="2" />
</GridLayout>
</LinearLayout>
</ScrollView>
android:text="Follow"
android:id="@+id/button4"
android:layout_row="2"
android:layout_column="2"
style="@style/ButtonStyle"
/>
</GridLayout>
</LinearLayout>

</FrameLayout>

Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/values/styles.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,8 @@
<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 2d9caa8

Please sign in to comment.