Skip to content

yotta / pictogram

Go to a project
Commit f905d932 by Sebastián Collado Montañez
Options

layout with dp

parent 0cf55e28
Inline Side-by-side
Showing with 38 additions and 47 deletions
android/Pictogram/tabletlibrary/src/main/res/layout/activity_session.xml
...@@ -97,13 +97,13 @@ ...@@ -97,13 +97,13 @@
</RelativeLayout> </RelativeLayout>
<View <View
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="@android:color/darker_gray"
android:layout_marginBottom="16dp"
android:id="@+id/view" android:id="@+id/view"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_below="@+id/sessionTopbarLayout" android:layout_below="@+id/sessionTopbarLayout"
android:layout_marginTop="0dp" /> android:layout_marginBottom="16dp"
android:layout_marginTop="0dp"
android:background="@android:color/darker_gray" />
<RelativeLayout <RelativeLayout
......
android/Pictogram/tabletlibrary/src/main/res/layout/voca.xml
...@@ -19,21 +19,21 @@ ...@@ -19,21 +19,21 @@
<ImageButton <ImageButton
android:layout_width="@dimen/picto_normal_width"
android:layout_height="@dimen/tape_normal_height"
android:src="@drawable/remove_picto_from_tape"
android:id="@+id/button_delete" android:id="@+id/button_delete"
android:layout_alignParentTop="true" android:layout_width="100dp"
android:layout_height="100dp"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:background="@android:color/holo_red_light"
android:clickable="true"
android:paddingLeft="16dp" android:paddingLeft="16dp"
android:paddingRight="16dp" android:paddingRight="16dp"
android:clickable="true" android:src="@drawable/remove_picto_from_tape" />
android:background="@android:color/holo_red_light" />
<GridView <GridView
android:id="@+id/tape_grid_view" android:id="@+id/tape_grid_view"
android:layout_width="@dimen/picto_normal_width" android:layout_width="match_parent"
android:layout_height="@dimen/tape_normal_height" android:layout_height="100dp"
android:layout_toEndOf="@+id/button_delete" android:layout_toEndOf="@+id/button_delete"
android:layout_toStartOf="@+id/button_tts" android:layout_toStartOf="@+id/button_tts"
android:accessibilityLiveRegion="none" android:accessibilityLiveRegion="none"
...@@ -45,8 +45,8 @@ ...@@ -45,8 +45,8 @@
<ImageButton <ImageButton
android:id="@+id/button_tts" android:id="@+id/button_tts"
android:layout_width="@dimen/picto_normal_width" android:layout_width="100dp"
android:layout_height="@dimen/tape_normal_height" android:layout_height="100dp"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:adjustViewBounds="true" android:adjustViewBounds="true"
......
android/Pictogram/tabletlibrary/src/main/res/layout/voca_big.xml
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
<ImageButton <ImageButton
android:id="@+id/button_delete" android:id="@+id/button_delete"
android:layout_width="@dimen/picto_big_width" android:layout_width="120dp"
android:layout_height="@dimen/tape_big_height" android:layout_height="120dp"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:background="@android:color/holo_red_light" android:background="@android:color/holo_red_light"
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
<GridView <GridView
android:id="@+id/tape_grid_view" android:id="@+id/tape_grid_view"
android:layout_width="@dimen/picto_big_width" android:layout_width="match_parent"
android:layout_height="@dimen/tape_big_height" android:layout_height="120dp"
android:layout_toEndOf="@+id/button_delete" android:layout_toEndOf="@+id/button_delete"
android:layout_toStartOf="@+id/button_tts" android:layout_toStartOf="@+id/button_tts"
android:accessibilityLiveRegion="none" android:accessibilityLiveRegion="none"
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
<ImageButton <ImageButton
android:id="@+id/button_tts" android:id="@+id/button_tts"
android:layout_width="@dimen/picto_big_width" android:layout_width="120dp"
android:layout_height="@dimen/tape_big_height" android:layout_height="120dp"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:adjustViewBounds="true" android:adjustViewBounds="true"
......
android/Pictogram/tabletlibrary/src/main/res/layout/vocabulary_manager.xml
...@@ -64,14 +64,15 @@ ...@@ -64,14 +64,15 @@
</RelativeLayout> </RelativeLayout>
<ImageButton <ImageButton
android:id="@+id/showPictoCategoriesViewButton"
android:layout_width="96dp" android:layout_width="96dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/showPictoCategoriesViewButton"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:src="@drawable/show_categories_grid" android:layout_below="@+id/loginTopbarLayout"
android:background="#EEEEEE" android:background="#EEEEEE"
android:paddingTop="36dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:layout_below="@+id/loginTopbarLayout" /> android:src="@drawable/show_categories_grid" />
<GridView <GridView
android:id="@+id/picto_category_grid_view" android:id="@+id/picto_category_grid_view"
...@@ -79,6 +80,7 @@ ...@@ -79,6 +80,7 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_below="@+id/loginTopbarLayout"
android:layout_toEndOf="@+id/showPictoCategoriesViewButton" android:layout_toEndOf="@+id/showPictoCategoriesViewButton"
android:background="#DDDDDD" android:background="#DDDDDD"
android:gravity="center_vertical|center|center_horizontal" android:gravity="center_vertical|center|center_horizontal"
...@@ -86,8 +88,8 @@ ...@@ -86,8 +88,8 @@
android:numColumns="10" android:numColumns="10"
android:paddingLeft="@dimen/small_padding" android:paddingLeft="@dimen/small_padding"
android:paddingRight="@dimen/small_padding" android:paddingRight="@dimen/small_padding"
android:verticalSpacing="@dimen/picto_grid_spacing" android:paddingTop="36dp"
android:layout_below="@+id/loginTopbarLayout"></GridView> android:verticalSpacing="@dimen/picto_grid_spacing"></GridView>
<GridView <GridView
android:id="@+id/picto_main_grid_view" android:id="@+id/picto_main_grid_view"
...@@ -96,11 +98,12 @@ ...@@ -96,11 +98,12 @@
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_below="@+id/loginTopbarLayout"
android:background="#DDDDDD" android:background="#DDDDDD"
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:verticalSpacing="@dimen/picto_grid_spacing" android:paddingTop="36dp"
android:layout_below="@+id/loginTopbarLayout"></GridView> android:verticalSpacing="@dimen/picto_grid_spacing"></GridView>
</RelativeLayout> </RelativeLayout>
......
android/Pictogram/tabletlibrary/src/main/res/layout/vocabulary_manager_big.xml
...@@ -96,18 +96,18 @@ ...@@ -96,18 +96,18 @@
android:layout_width="96dp" android:layout_width="96dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_below="@+id/sessionTopbarLayout"
android:background="#EEEEEE" android:background="#EEEEEE"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:src="@drawable/show_categories_grid" android:src="@drawable/show_categories_grid" />
android:layout_below="@+id/sessionTopbarLayout" />
<GridView <GridView
android:id="@+id/picto_category_grid_view" android:id="@+id/picto_category_grid_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/tape_big_height" android:layout_height="match_parent"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_below="@+id/loginTopbarLayout" android:layout_below="@+id/sessionTopbarLayout"
android:layout_toEndOf="@+id/showPictoCategoriesViewButton" android:layout_toEndOf="@+id/showPictoCategoriesViewButton"
android:background="#DDDDDD" android:background="#DDDDDD"
android:gravity="center_vertical|center|center_horizontal" android:gravity="center_vertical|center|center_horizontal"
...@@ -123,13 +123,13 @@ ...@@ -123,13 +123,13 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/sessionTopbarLayout"
android:background="#DDDDDD" android:background="#DDDDDD"
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:verticalSpacing="@dimen/picto_grid_spacing" android:verticalSpacing="@dimen/picto_grid_spacing"></GridView>
android:layout_below="@+id/sessionTopbarLayout"
android:layout_alignParentStart="true"></GridView>
</RelativeLayout> </RelativeLayout>
......
android/Pictogram/tabletlibrary/tabletlibrary.iml
...@@ -121,16 +121,5 @@ ...@@ -121,16 +121,5 @@
<orderEntry type="library" exported="" name="play-services-ads-9.2.1" level="project" /> <orderEntry type="library" exported="" name="play-services-ads-9.2.1" level="project" />
<orderEntry type="library" exported="" name="play-services-ads-lite-9.2.1" level="project" /> <orderEntry type="library" exported="" name="play-services-ads-lite-9.2.1" level="project" />
<orderEntry type="module" module-name="commonlibrary" exported="" /> <orderEntry type="module" module-name="commonlibrary" exported="" />
<orderEntry type="library" exported="" name="okhttp-ws-2.3.0" level="project" />
<orderEntry type="library" exported="" name="socket.io-client-0.5.0" level="project" />
<orderEntry type="library" exported="" name="okhttp-2.3.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-23.0.0" level="project" />
<orderEntry type="library" exported="" name="okio-1.3.0" level="project" />
<orderEntry type="library" exported="" name="gson-2.3" level="project" />
<orderEntry type="library" exported="" name="engine.io-client-0.5.0" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="json-20090211" level="project" />
</component> </component>
</module> </module>
\ No newline at end of file
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