Skip to content

yotta / pictogram

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

menu to dp, delete office from menu

parent b4dece93
Inline Side-by-side
Showing with 62 additions and 67 deletions
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/login/LoginActivity.java
...@@ -62,13 +62,11 @@ public class LoginActivity extends FragmentActivity { ...@@ -62,13 +62,11 @@ public class LoginActivity extends FragmentActivity {
super.onStart(); super.onStart();
// Set supervisor information on topbar // Set supervisor information on topbar
final TextView supervisorFullNameView = (TextView) findViewById(R.id.loginTopbarSupervisorFullName); final TextView supervisorFullNameView = (TextView) findViewById(R.id.loginTopbarSupervisorFullName);
final TextView supervisorUserNameView = (TextView) findViewById(R.id.loginTopbarSupervisorUserName);
final ImageView supervisorPhotoView = (ImageView) findViewById(R.id.loginTopbarSupervisorPhoto); final ImageView supervisorPhotoView = (ImageView) findViewById(R.id.loginTopbarSupervisorPhoto);
supervisorFullNameView.setText( supervisorFullNameView.setText(
this.getIntent().getStringExtra("name") + " " + this.getIntent().getStringExtra("name") + " " +
this.getIntent().getStringExtra("surname")+" ("+this.getIntent().getStringExtra("office")+")"); this.getIntent().getStringExtra("surname") + " ("+this.getIntent().getStringExtra("email")+")");
supervisorUserNameView.setText(this.getIntent().getStringExtra("email"));
final Vector<Img> imgs = new Vector<>(1); final Vector<Img> imgs = new Vector<>(1);
imgs.add(new Img( imgs.add(new Img(
......
android/Pictogram/tabletlibrary/src/main/res/layout/activity_login.xml
...@@ -8,22 +8,18 @@ ...@@ -8,22 +8,18 @@
<RelativeLayout <RelativeLayout
android:id="@+id/loginTopbarLayout" android:id="@+id/loginTopbarLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="70dp" 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_alignParentBottom="true"
android:layout_alignParentStart="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" />
android:layout_centerVertical="true"
android:layout_alignParentStart="true" />
<LinearLayout <LinearLayout
android:id="@+id/loginTopbarSupervisorNameLayout" android:id="@+id/loginTopbarSupervisorNameLayout"
...@@ -44,26 +40,19 @@ ...@@ -44,26 +40,19 @@
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/BlancoApp" /> android:textColor="@color/BlancoApp" />
<TextView
android:id="@+id/loginTopbarSupervisorUserName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/BlancoApp" />
</LinearLayout> </LinearLayout>
<Button <Button
android:id="@+id/loginTopbarLogout" android:id="@+id/loginTopbarLogout"
style="@android:style/TextAppearance.Material.Button" style="@android:style/TextAppearance.Material.Button"
android:textColor="@color/BlancoApp"
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:layout_alignParentTop="true"
android:enabled="false" android:enabled="false"
android:text="@string/logout" /> android:text="@string/logout"
android:textColor="@color/BlancoApp" />
</RelativeLayout> </RelativeLayout>
......
android/Pictogram/tabletlibrary/src/main/res/layout/voca.xml
<FrameLayout <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal"
android:background="#BDBDBD" android:background="#BDBDBD"
android:keepScreenOn="true" android:keepScreenOn="true"
tools:context="com.yottacode.pictogram.tabletlibrary.gui.communicator.VOCA" android:orientation="horizontal"
android:padding="@dimen/small_padding"> android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
tools:context="com.yottacode.pictogram.tabletlibrary.gui.communicator.VOCA">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/pictogramLayout" android:id="@+id/pictogramLayout"
> android:layout_width="match_parent"
android:layout_height="match_parent">
<!-- 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) -->
...@@ -57,14 +54,14 @@ ...@@ -57,14 +54,14 @@
android:src="@drawable/send_tape" /> android:src="@drawable/send_tape" />
<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/button_delete"
android:background="#EEEEEE" android:background="#EEEEEE"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:layout_below="@+id/button_delete" /> android:src="@drawable/show_categories_grid" />
<GridView <GridView
android:id="@+id/picto_category_grid_view" android:id="@+id/picto_category_grid_view"
...@@ -72,6 +69,7 @@ ...@@ -72,6 +69,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/tape_grid_view"
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"
...@@ -79,8 +77,7 @@ ...@@ -79,8 +77,7 @@
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:verticalSpacing="@dimen/picto_grid_spacing"></GridView>
android:layout_below="@+id/tape_grid_view"></GridView>
<GridView <GridView
android:id="@+id/picto_main_grid_view" android:id="@+id/picto_main_grid_view"
...@@ -89,11 +86,11 @@ ...@@ -89,11 +86,11 @@
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/button_delete"
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:verticalSpacing="@dimen/picto_grid_spacing"></GridView>
android:layout_below="@+id/button_delete"></GridView>
</RelativeLayout> </RelativeLayout>
......
android/Pictogram/tabletlibrary/src/main/res/layout/voca_big.xml
<FrameLayout <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal"
android:background="#BDBDBD" android:background="#BDBDBD"
android:keepScreenOn="true" android:keepScreenOn="true"
tools:context="com.yottacode.pictogram.tabletlibrary.gui.communicator.VOCA" android:orientation="horizontal"
android:padding="@dimen/small_padding"> android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
tools:context="com.yottacode.pictogram.tabletlibrary.gui.communicator.VOCA">
<RelativeLayout <RelativeLayout
android:id="@+id/pictogramLayout" android:id="@+id/pictogramLayout"
...@@ -62,10 +60,10 @@ ...@@ -62,10 +60,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/button_delete"
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/button_delete" />
<GridView <GridView
android:id="@+id/picto_category_grid_view" android:id="@+id/picto_category_grid_view"
...@@ -73,6 +71,7 @@ ...@@ -73,6 +71,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/tape_grid_view"
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"
...@@ -80,8 +79,7 @@ ...@@ -80,8 +79,7 @@
android:numColumns="8" android:numColumns="8"
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:verticalSpacing="@dimen/picto_grid_spacing"></GridView>
android:layout_below="@+id/tape_grid_view"></GridView>
<GridView <GridView
android:id="@+id/picto_main_grid_view" android:id="@+id/picto_main_grid_view"
...@@ -90,19 +88,19 @@ ...@@ -90,19 +88,19 @@
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/button_delete"
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/button_delete"></GridView>
</RelativeLayout> </RelativeLayout>
<FrameLayout <FrameLayout
android:id="@+id/fragment_container" android:id="@+id/fragment_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/tape_normal_height" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:orientation="horizontal"> android:orientation="horizontal">
......
android/Pictogram/tabletlibrary/src/main/res/layout/vocabulary_manager.xml
<FrameLayout <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal"
android:background="#BDBDBD" android:background="#BDBDBD"
android:keepScreenOn="true" android:keepScreenOn="true"
tools:context="com.yottacode.pictogram.tabletlibrary.gui.communicator.VocabularyManager" android:orientation="horizontal"
android:padding="@dimen/small_padding"> android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
tools:context="com.yottacode.pictogram.tabletlibrary.gui.communicator.VocabularyManager">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/pictogramLayout" android:id="@+id/pictogramLayout"
> android:layout_width="match_parent"
android:layout_height="match_parent">
<!-- 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
...@@ -107,4 +104,13 @@ ...@@ -107,4 +104,13 @@
</RelativeLayout> </RelativeLayout>
<FrameLayout
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:orientation="horizontal">
</FrameLayout>
</FrameLayout> </FrameLayout>
android/Pictogram/tabletlibrary/src/main/res/layout/vocabulary_manager_big.xml
<FrameLayout <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal"
android:background="#BDBDBD" android:background="#BDBDBD"
android:keepScreenOn="true" android:keepScreenOn="true"
tools:context="com.yottacode.pictogram.tabletlibrary.gui.communicator.VocabularyManager" android:orientation="horizontal"
android:padding="@dimen/small_padding"> android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
tools:context="com.yottacode.pictogram.tabletlibrary.gui.communicator.VocabularyManager">
<RelativeLayout <RelativeLayout
android:id="@+id/pictogramLayout" android:id="@+id/pictogramLayout"
...@@ -108,4 +106,13 @@ ...@@ -108,4 +106,13 @@
</RelativeLayout> </RelativeLayout>
<FrameLayout
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:orientation="horizontal">
</FrameLayout>
</FrameLayout> </FrameLayout>
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