Skip to content

yotta / pictogram

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

layout fixing...

parent a4658668
Inline Side-by-side
Showing with 107 additions and 79 deletions
android/Pictogram/tabletlibrary/src/main/res/layout/activity_session.xml
...@@ -7,98 +7,97 @@ ...@@ -7,98 +7,97 @@
tools:context="com.yottacode.pictogram.tabletlibrary.gui.session.SessionActivity"> tools:context="com.yottacode.pictogram.tabletlibrary.gui.session.SessionActivity">
<RelativeLayout <RelativeLayout
android:id="@+id/sessionTopbarLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="64dp"
android:layout_margin="8dp" android:background="@color/VerdeApp">
android:layout_marginLeft="16dp"
android:layout_marginTop="8dp"
android:layout_marginRight="16dp"
android:layout_marginBottom="0dp"
android:background="@color/VerdeApp"
android:id="@+id/sessionTopbarLayout">
<ImageView <ImageView
android:layout_width="48dp"
android:layout_height="48dp"
android:id="@+id/sessionTopbarStudentPhoto" android:id="@+id/sessionTopbarStudentPhoto"
android:layout_gravity="left" android:layout_width="64dp"
android:layout_alignParentTop="true" android:layout_height="64dp"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_gravity="left"
android:background="@color/accent_material_dark" android:background="@color/accent_material_dark"
android:scaleType="centerCrop" /> android:scaleType="centerCrop" />
<LinearLayout <LinearLayout
android:orientation="vertical" android:id="@+id/sessionTopbarStudentNameLayout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/sessionTopbarStudentNameLayout" android:layout_centerVertical="true"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/sessionTopbarStudentPhoto" android:layout_toEndOf="@+id/sessionTopbarStudentPhoto"
android:gravity="center_vertical"> android:gravity="center_vertical"
android:orientation="vertical">
<TextView <TextView
android:id="@+id/sessionTopbarStudentFullName"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="" android:text=""
android:id="@+id/sessionTopbarStudentFullName" /> android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView <TextView
android:id="@+id/sessionTopbarStudentUserName"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="" android:text=""
android:id="@+id/sessionTopbarStudentUserName" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/abc_secondary_text_material_light" /> android:textColor="@color/abc_secondary_text_material_light" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:orientation="vertical" android:id="@+id/methodLayout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/methodLayout"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:gravity="end" android:layout_marginRight="20dp"
android:layout_toLeftOf="@+id/sessionPauseBtn" android:layout_toLeftOf="@+id/sessionPauseBtn"
android:layout_marginRight="20dp"> android:gravity="end"
android:orientation="vertical">
<TextView <TextView
android:id="@+id/sessionTopbarMethodName"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="" android:text=""
android:id="@+id/sessionTopbarMethodName" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/blue" /> android:textColor="@color/blue" />
<TextView <TextView
android:id="@+id/sessionTopbarInstructionName"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="" android:text=""
android:id="@+id/sessionTopbarInstructionName" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/blue" /> android:textColor="@color/blue" />
</LinearLayout> </LinearLayout>
<ToggleButton <ToggleButton
android:id="@+id/sessionPauseBtn"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/sessionPauseBtn" android:layout_marginRight="10px"
android:layout_alignParentBottom="true" android:textColorLink="@color/darkgreen"
android:textOff="||" android:textOff="||"
android:textOn="||" android:textOn="||"
android:layout_toLeftOf="@+id/sessionOnOffBtn" android:layout_centerVertical="true"
android:textColorLink="@color/darkgreen" android:layout_toStartOf="@+id/sessionOnOffBtn" />
android:layout_marginRight="10px" />
<ToggleButton <ToggleButton
android:id="@+id/sessionOnOffBtn"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/sessionOnOffBtn"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:textOff="REC" android:textOff="REC"
android:textOn="REC" /> android:textOn="REC"
android:layout_alignBaseline="@+id/sessionPauseBtn"
android:layout_alignBottom="@+id/sessionPauseBtn"
android:layout_alignParentEnd="true" />
</RelativeLayout> </RelativeLayout>
......
android/Pictogram/tabletlibrary/src/main/res/layout/vocabulary_manager.xml
...@@ -20,19 +20,15 @@ ...@@ -20,19 +20,15 @@
<RelativeLayout <RelativeLayout
android:id="@+id/loginTopbarLayout" android:id="@+id/loginTopbarLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/tape_normal_height" android:layout_height="64dp"
android:background="@color/VerdeApp" android:background="@color/VerdeApp">
android:paddingBottom="5dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingTop="5dp">
<ImageView <ImageView
android:id="@+id/loginTopbarSupervisorPhoto" android:id="@+id/loginTopbarSupervisorPhoto"
android:layout_width="50dp" android:layout_width="64dp"
android:layout_height="50dp" android:layout_height="64dp"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_centerVertical="true" android:layout_alignParentTop="true"
android:layout_gravity="left" android:layout_gravity="left"
android:background="@color/accent_material_dark" android:background="@color/accent_material_dark"
android:scaleType="centerCrop" /> android:scaleType="centerCrop" />
...@@ -70,12 +66,12 @@ ...@@ -70,12 +66,12 @@
style="@android:style/TextAppearance.Material.Button" style="@android:style/TextAppearance.Material.Button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:enabled="false" android:enabled="false"
android:text="@string/logout" android:text="@string/logout"
android:textColor="@color/BlancoApp" /> android:textColor="@color/BlancoApp"
android:layout_marginEnd="11dp"
android:layout_centerVertical="true"
android:layout_alignParentEnd="true" />
</RelativeLayout> </RelativeLayout>
...@@ -86,8 +82,8 @@ ...@@ -86,8 +82,8 @@
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:src="@drawable/show_categories_grid" android:src="@drawable/show_categories_grid"
android:background="#EEEEEE" android:background="#EEEEEE"
android:layout_below="@+id/tape_grid_view" android:scaleType="fitCenter"
android:scaleType="fitCenter" /> android:layout_below="@+id/loginTopbarLayout" />
<GridView <GridView
android:id="@+id/picto_category_grid_view" android:id="@+id/picto_category_grid_view"
......
android/Pictogram/tabletlibrary/src/main/res/layout/vocabulary_manager_big.xml
...@@ -17,64 +17,97 @@ ...@@ -17,64 +17,97 @@
<!-- android:keepScreenOn - To keep the screen bright as long as the app is visible (also forever) --> <!-- android:keepScreenOn - To keep the screen bright as long as the app is visible (also forever) -->
<RelativeLayout <RelativeLayout
android:id="@+id/loginTopbarLayout" android:id="@+id/sessionTopbarLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/tape_big_height" android:layout_height="64dp"
android:background="@color/VerdeApp" android:layout_alignParentStart="true"
android:paddingBottom="5dp" android:background="@color/VerdeApp">
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingTop="5dp">
<ImageView <ImageView
android:id="@+id/loginTopbarSupervisorPhoto" android:id="@+id/sessionTopbarStudentPhoto"
android:layout_width="50dp" android:layout_width="64dp"
android:layout_height="50dp" android:layout_height="64dp"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_centerVertical="true" android:layout_alignParentTop="true"
android:layout_gravity="left" android:layout_gravity="left"
android:background="@color/accent_material_dark" android:background="@color/accent_material_dark"
android:scaleType="centerCrop" /> android:scaleType="centerCrop" />
<LinearLayout <LinearLayout
android:id="@+id/loginTopbarSupervisorNameLayout" android:id="@+id/sessionTopbarStudentNameLayout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:layout_toEndOf="@+id/loginTopbarSupervisorPhoto" android:layout_toEndOf="@+id/sessionTopbarStudentPhoto"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/loginTopbarSupervisorFullName" android:id="@+id/sessionTopbarStudentFullName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium" />
<TextView
android:id="@+id/sessionTopbarStudentUserName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/abc_secondary_text_material_light" />
</LinearLayout>
<LinearLayout
android:id="@+id/methodLayout"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:layout_marginRight="20dp"
android:layout_toLeftOf="@+id/sessionPauseBtn"
android:gravity="end"
android:orientation="vertical">
<TextView
android:id="@+id/sessionTopbarMethodName"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="" android:text=""
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/BlancoApp" /> android:textColor="@color/blue" />
<TextView <TextView
android:id="@+id/loginTopbarSupervisorUserName" android:id="@+id/sessionTopbarInstructionName"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="" android:text=""
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/BlancoApp" /> android:textColor="@color/blue" />
</LinearLayout> </LinearLayout>
<Button <ToggleButton
android:id="@+id/loginTopbarLogout" android:id="@+id/sessionPauseBtn"
style="@android:style/TextAppearance.Material.Button" android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginRight="10px"
android:layout_toLeftOf="@+id/sessionOnOffBtn"
android:textColorLink="@color/darkgreen"
android:textOff="||"
android:textOn="||" />
<ToggleButton
android:id="@+id/sessionOnOffBtn"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentTop="true" android:textOff="REC"
android:enabled="false" android:textOn="REC" />
android:text="@string/logout"
android:textColor="@color/BlancoApp" />
</RelativeLayout> </RelativeLayout>
...@@ -83,10 +116,10 @@ ...@@ -83,10 +116,10 @@
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/tape_grid_view"
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"
...@@ -116,7 +149,7 @@ ...@@ -116,7 +149,7 @@
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"
android:layout_below="@+id/loginTopbarLayout"></GridView> android:layout_below="@+id/sessionTopbarLayout"></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