Skip to content

yotta / pictogram

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

working on layout

parent 5c2c9556
Inline Side-by-side
Showing with 87 additions and 69 deletions
android/Pictogram/commonlibrary/src/main/res/values-sw600dp/dimens.xml
......@@ -3,16 +3,22 @@
<dimen name="activity_horizontal_margin">8px</dimen>
<dimen name="activity_vertical_margin">8px</dimen>
<dimen name="small_padding">4px</dimen>
<!-- Horizontal and vertical spacing between pictos -->
<dimen name="picto_grid_spacing">1px</dimen>
<!-- Picto border -->
<dimen name="picto_border_width">2px</dimen>
<!-- Picto padding ¿? -->
<dimen name="picto_padding">1px</dimen>
<dimen name="picto_normal_height">90px</dimen>
<dimen name="picto_normal_width">90px</dimen>
<dimen name="tape_normal_height">100px</dimen>
<dimen name="picto_big_height">108px</dimen>
<dimen name="picto_big_width">108px</dimen>
<dimen name="tape_big_height">118px</dimen>
<!-- Picto normal size -->
<dimen name="picto_normal_side">90px</dimen>
<!-- Picto big size -->
<dimen name="picto_big_side">115dp</dimen>
<!-- Tape -->
<dimen name="tape_normal_height">100dp</dimen>
<dimen name="tape_big_height">126dp</dimen>
<!-- Menu size -->
<dimen name="menu_top_height">64dp</dimen>
<!-- Picto session -->
<dimen name="picto_session_height">75px</dimen>
<dimen name="picto_session_width">75px</dimen>
</resources>
......
android/Pictogram/commonlibrary/src/main/res/values-xhdpi/dimens.xml
......@@ -3,16 +3,22 @@
<dimen name="activity_horizontal_margin">8px</dimen>
<dimen name="activity_vertical_margin">8px</dimen>
<dimen name="small_padding">4px</dimen>
<!-- Horizontal and vertical spacing between pictos -->
<dimen name="picto_grid_spacing">2px</dimen>
<!-- Picto border -->
<dimen name="picto_border_width">1px</dimen>
<!-- Picto padding ¿? -->
<dimen name="picto_padding">1px</dimen>
<dimen name="picto_normal_height">90px</dimen>
<dimen name="picto_normal_width">90px</dimen>
<dimen name="tape_normal_height">100px</dimen>
<dimen name="picto_big_height">135px</dimen>
<dimen name="picto_big_width">135px</dimen>
<dimen name="tape_big_height">145px</dimen>
<!-- Picto normal size -->
<dimen name="picto_normal_side">90px</dimen>
<!-- Picto big size -->
<dimen name="picto_big_side">115dp</dimen>
<!-- Tape -->
<dimen name="tape_normal_height">100dp</dimen>
<dimen name="tape_big_height">126dp</dimen>
<!-- Menu size -->
<dimen name="menu_top_height">64dp</dimen>
<!-- Picto session -->
<dimen name="picto_session_height">84dp</dimen>
<dimen name="picto_session_width">84dp</dimen>
</resources>
android/Pictogram/commonlibrary/src/main/res/values-xxhdpi/dimens.xml
......@@ -3,16 +3,22 @@
<dimen name="activity_horizontal_margin">8px</dimen>
<dimen name="activity_vertical_margin">8px</dimen>
<dimen name="small_padding">4px</dimen>
<!-- Horizontal and vertical spacing between pictos -->
<dimen name="picto_grid_spacing">1px</dimen>
<!-- Picto border -->
<dimen name="picto_border_width">1px</dimen>
<!-- Picto padding ¿? -->
<dimen name="picto_padding">1px</dimen>
<dimen name="picto_normal_height">90px</dimen>
<dimen name="picto_normal_width">90px</dimen>
<dimen name="tape_normal_height">100px</dimen>
<dimen name="picto_big_height">116px</dimen>
<dimen name="picto_big_width">116px</dimen>
<dimen name="tape_big_height">118px</dimen>
<!-- Picto normal size -->
<dimen name="picto_normal_side">90px</dimen>
<!-- Picto big size -->
<dimen name="picto_big_side">115dp</dimen>
<!-- Tape -->
<dimen name="tape_normal_height">100dp</dimen>
<dimen name="tape_big_height">126dp</dimen>
<!-- Menu size -->
<dimen name="menu_top_height">64dp</dimen>
<!-- Picto session -->
<dimen name="picto_session_height">75px</dimen>
<dimen name="picto_session_width">75px</dimen>
</resources>
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/session/PictoAdapter.java
......@@ -124,13 +124,13 @@ public long getItemId(int position) {
}
public void evaluateItem(Bitmap bmp, String evaluation,int position) {
Item item=this.msg.get(position);
Bitmap oldmsg=item.getImg();
float width =context.getResources().getDimension(R.dimen.picto_session_width);
public void evaluateItem(Bitmap bmp, String evaluation, int position) {
Item item = this.msg.get(position);
Bitmap oldmsg = item.getImg();
float width = context.getResources().getDimension(R.dimen.picto_session_width);
float height = context.getResources().getDimension(R.dimen.picto_session_height);
bmp=new BitmapTools(bmp).resize((int)width ,(int)height).get();
bmp=set_text(context,bmp,getTimeDiff(new Date().getTime()));
bmp = new BitmapTools(bmp).resize((int)width ,(int)height).get();
bmp = set_text(context,bmp,getTimeDiff(new Date().getTime()));
Bitmap currmsg = position>=this.msg.size()-1 ? combineImages(oldmsg,bmp) : updateImage(oldmsg,bmp);
item.setImg(currmsg,evaluation,true);
}
......
android/Pictogram/tabletlibrary/src/main/res/layout/activity_login.xml
......@@ -8,13 +8,13 @@
<RelativeLayout
android:id="@+id/loginTopbarLayout"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_height="@dimen/menu_top_height"
android:background="@color/VerdeApp">
<ImageView
android:id="@+id/loginTopbarSupervisorPhoto"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_width="@dimen/menu_top_height"
android:layout_height="@dimen/menu_top_height"
android:layout_alignParentBottom="true"
android:layout_alignParentStart="true"
android:layout_gravity="left"
......
android/Pictogram/tabletlibrary/src/main/res/layout/picto_grid_item.xml
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/picto_grid_item_layout_wrapper"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical|center|center_horizontal"
android:id="@+id/picto_grid_item_layout_wrapper"
android:background="@drawable/picto_grid_item_border"
android:gravity="center_vertical|center|center_horizontal"
android:padding="@dimen/picto_border_width">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="@dimen/picto_normal_height"
android:id="@+id/picto_grid_item_layout"
android:layout_width="match_parent"
android:layout_height="@dimen/picto_normal_side"
android:background="@color/picto_default_background"
android:padding="@dimen/picto_padding">
......@@ -20,35 +20,35 @@
android:layout_height="match_parent" />
<TextView
android:text="Legend"
android:id="@+id/legend_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/legend_text"
android:textSize="11sp"
android:textColor="@android:color/black"
android:textAlignment="center"
android:layout_gravity="bottom"
android:visibility="gone"
android:background="@android:color/white" />
android:background="@android:color/white"
android:text="Legend"
android:textAlignment="center"
android:textColor="@android:color/black"
android:textSize="11sp"
android:visibility="gone" />
<TextView
android:text="Legend"
android:id="@+id/legend_text_full"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/legend_text_full"
android:textSize="18sp"
android:textColor="@android:color/black"
android:textAlignment="center"
android:maxLines="5"
android:gravity="center"
android:layout_gravity="center"
android:visibility="gone"
android:background="@android:color/white" />
android:background="@android:color/white"
android:gravity="center"
android:maxLines="5"
android:text="Legend"
android:textAlignment="center"
android:textColor="@android:color/black"
android:textSize="18sp"
android:visibility="gone" />
<ImageView
android:id="@+id/picto_grid_item_redcross"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/picto_grid_item_redcross"
android:src="@drawable/disabled_picto" />
</FrameLayout>
......
android/Pictogram/tabletlibrary/src/main/res/layout/picto_grid_item_big.xml
......@@ -2,8 +2,8 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/picto_grid_item_layout_wrapper_big"
android:layout_width="@dimen/picto_big_width"
android:layout_height="@dimen/picto_big_height"
android:layout_width="@dimen/picto_big_side"
android:layout_height="@dimen/picto_big_side"
android:background="@drawable/picto_grid_item_border"
android:gravity="center_vertical|center|center_horizontal"
android:padding="@dimen/picto_border_width">
......
android/Pictogram/tabletlibrary/src/main/res/layout/voca.xml
......@@ -17,8 +17,8 @@
<ImageButton
android:id="@+id/button_delete"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_width="@dimen/tape_normal_height"
android:layout_height="@dimen/tape_normal_height"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:background="@android:color/holo_red_light"
......@@ -30,7 +30,7 @@
<GridView
android:id="@+id/tape_grid_view"
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_height="@dimen/tape_normal_height"
android:layout_toEndOf="@+id/button_delete"
android:layout_toStartOf="@+id/button_tts"
android:accessibilityLiveRegion="none"
......@@ -42,8 +42,8 @@
<ImageButton
android:id="@+id/button_tts"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_width="@dimen/tape_normal_height"
android:layout_height="@dimen/tape_normal_height"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:adjustViewBounds="true"
......
android/Pictogram/tabletlibrary/src/main/res/layout/voca_big.xml
......@@ -17,8 +17,8 @@
<ImageButton
android:id="@+id/button_delete"
android:layout_width="120dp"
android:layout_height="120dp"
android:layout_width="@dimen/tape_big_height"
android:layout_height="@dimen/tape_big_height"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:background="@android:color/holo_red_light"
......@@ -30,7 +30,7 @@
<GridView
android:id="@+id/tape_grid_view"
android:layout_width="match_parent"
android:layout_height="120dp"
android:layout_height="@dimen/tape_big_height"
android:layout_toEndOf="@+id/button_delete"
android:layout_toStartOf="@+id/button_tts"
android:accessibilityLiveRegion="none"
......@@ -44,8 +44,8 @@
<ImageButton
android:id="@+id/button_tts"
android:layout_width="120dp"
android:layout_height="120dp"
android:layout_width="@dimen/tape_big_height"
android:layout_height="@dimen/tape_big_height"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:adjustViewBounds="true"
......
android/Pictogram/tabletlibrary/src/main/res/layout/vocabulary_manager.xml
......@@ -17,13 +17,13 @@
<RelativeLayout
android:id="@+id/loginTopbarLayout"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_height="@dimen/menu_top_height"
android:background="@color/VerdeApp">
<ImageView
android:id="@+id/loginTopbarSupervisorPhoto"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_width="@dimen/menu_top_height"
android:layout_height="@dimen/menu_top_height"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_gravity="left"
......
android/Pictogram/tabletlibrary/src/main/res/layout/vocabulary_manager_big.xml
......@@ -17,14 +17,14 @@
<RelativeLayout
android:id="@+id/sessionTopbarLayout"
android:layout_width="match_parent"
android:layout_height="64dp"
android:layout_height="@dimen/menu_top_height"
android:layout_alignParentStart="true"
android:background="@color/VerdeApp">
<ImageView
android:id="@+id/sessionTopbarStudentPhoto"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_width="@dimen/menu_top_height"
android:layout_height="@dimen/menu_top_height"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_gravity="left"
......
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