Skip to content

yotta / pictogram

Go to a project
Commit 1604f61d by Germán Callejas Alcántara
Options

Arreglado el que la tira de locución del pcb cuando tiene pictos pudiese hacer scroll

parent a462a5f3
Inline Side-by-side
Showing with 19 additions and 31 deletions
android/Pictogram/tabletlibrary/src/main/res/layout/activity_pictogram.xml
...@@ -32,18 +32,16 @@ ...@@ -32,18 +32,16 @@
<GridView <GridView
android:id="@+id/tape_grid_view" android:id="@+id/tape_grid_view"
android:layout_toEndOf="@+id/button_delete"
android:layout_toStartOf="@+id/button_tts"
android:layout_width="@dimen/picto_normal_width" android:layout_width="@dimen/picto_normal_width"
android:layout_height="@dimen/tape_normal_height" android:layout_height="@dimen/tape_normal_height"
android:padding="@dimen/small_padding" android:layout_toEndOf="@+id/button_delete"
android:gravity="center" android:layout_toStartOf="@+id/button_tts"
android:numColumns="8"
android:accessibilityLiveRegion="none" android:accessibilityLiveRegion="none"
android:background="@android:color/holo_red_light" android:background="@android:color/holo_red_light"
android:clickable="true" android:clickable="true"
android:horizontalSpacing="@dimen/picto_grid_spacing"> android:gravity="center"
</GridView> android:horizontalSpacing="@dimen/picto_grid_spacing"
android:numColumns="8"></GridView>
<ImageButton <ImageButton
android:layout_width="@dimen/picto_normal_width" android:layout_width="@dimen/picto_normal_width"
...@@ -70,38 +68,32 @@ ...@@ -70,38 +68,32 @@
<GridView <GridView
android:id="@+id/picto_category_grid_view" android:id="@+id/picto_category_grid_view"
android:layout_height="match_parent"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_below="@+id/tape_grid_view" android:layout_height="match_parent"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:numColumns="10"
android:gravity="center_vertical|center|center_horizontal"
android:background="#DDDDDD"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_below="@+id/tape_grid_view"
android:layout_toEndOf="@+id/showPictoCategoriesViewButton" android:layout_toEndOf="@+id/showPictoCategoriesViewButton"
android:background="#DDDDDD"
android:gravity="center_vertical|center|center_horizontal"
android:horizontalSpacing="@dimen/picto_grid_spacing"
android:numColumns="10"
android:paddingLeft="@dimen/small_padding" android:paddingLeft="@dimen/small_padding"
android:paddingTop="@dimen/small_padding"
android:paddingRight="@dimen/small_padding" android:paddingRight="@dimen/small_padding"
android:paddingBottom="@dimen/small_padding" android:verticalSpacing="@dimen/picto_grid_spacing"></GridView>
android:verticalSpacing="@dimen/picto_grid_spacing"
android:horizontalSpacing="@dimen/picto_grid_spacing">
</GridView>
<GridView <GridView
android:id="@+id/picto_main_grid_view" android:id="@+id/picto_main_grid_view"
android:layout_height="match_parent"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_below="@+id/tape_grid_view" android:layout_height="match_parent"
android:layout_alignParentStart="true"
android:gravity="center_vertical|center|center_horizontal"
android:background="#DDDDDD"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:paddingLeft="@dimen/small_padding" android:layout_alignParentStart="true"
android:paddingTop="@dimen/small_padding" android:layout_below="@+id/tape_grid_view"
android:background="#DDDDDD"
android:gravity="center_vertical|center|center_horizontal"
android:horizontalSpacing="@dimen/picto_grid_spacing" android:horizontalSpacing="@dimen/picto_grid_spacing"
android:verticalSpacing="@dimen/picto_grid_spacing"> android:verticalSpacing="@dimen/picto_grid_spacing"></GridView>
</GridView>
</RelativeLayout> </RelativeLayout>
......
android/Pictogram/tabletlibrary/src/main/res/layout/activity_pictogram_big.xml
...@@ -41,8 +41,7 @@ ...@@ -41,8 +41,7 @@
android:gravity="center" android:gravity="center"
android:horizontalSpacing="@dimen/picto_grid_spacing" android:horizontalSpacing="@dimen/picto_grid_spacing"
android:longClickable="true" android:longClickable="true"
android:numColumns="6" android:numColumns="6"></GridView>
android:padding="@dimen/small_padding"></GridView>
<ImageButton <ImageButton
...@@ -80,10 +79,8 @@ ...@@ -80,10 +79,8 @@
android:gravity="center_vertical|center|center_horizontal" android:gravity="center_vertical|center|center_horizontal"
android:horizontalSpacing="@dimen/picto_grid_spacing" android:horizontalSpacing="@dimen/picto_grid_spacing"
android:numColumns="8" android:numColumns="8"
android:paddingBottom="@dimen/small_padding"
android:paddingLeft="@dimen/small_padding" android:paddingLeft="@dimen/small_padding"
android:paddingRight="@dimen/small_padding" android:paddingRight="@dimen/small_padding"
android:paddingTop="@dimen/small_padding"
android:verticalSpacing="@dimen/picto_grid_spacing"></GridView> android:verticalSpacing="@dimen/picto_grid_spacing"></GridView>
<GridView <GridView
...@@ -98,7 +95,6 @@ ...@@ -98,7 +95,6 @@
android:gravity="center_vertical|center|center_horizontal" android:gravity="center_vertical|center|center_horizontal"
android:horizontalSpacing="@dimen/picto_grid_spacing" android:horizontalSpacing="@dimen/picto_grid_spacing"
android:paddingLeft="@dimen/small_padding" android:paddingLeft="@dimen/small_padding"
android:paddingTop="@dimen/small_padding"
android:verticalSpacing="@dimen/picto_grid_spacing"></GridView> android:verticalSpacing="@dimen/picto_grid_spacing"></GridView>
</RelativeLayout> </RelativeLayout>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment