Skip to content

yotta / pictogram

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

Añadido menu lateral a la vista de editar picto para mostrar los supervisores

parent 7c61dd83
Inline Side-by-side
Showing with 340 additions and 255 deletions
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/cropper/EditPictoActivity.java
......@@ -18,16 +18,23 @@ import android.os.Environment;
import android.provider.MediaStore;
import android.support.annotation.NonNull;
import android.support.v4.app.ActivityCompat;
import android.support.v4.widget.DrawerLayout;
import android.support.v7.app.ActionBarDrawerToggle;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.Gravity;
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.View;
import android.view.Window;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import android.widget.ListAdapter;
import android.widget.ListView;
import android.widget.SeekBar;
import android.widget.TextView;
import android.widget.Toast;
......@@ -44,6 +51,8 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Random;
import pl.droidsonroids.gif.GifTextView;
......@@ -89,7 +98,15 @@ public class EditPictoActivity extends Activity {
//For Legend//////////////////////////////////////////////////////////////////////////
EditText legend;
//For Associated Supervisors/////////////////////////////////////////////////////////
Button desplegableSupervisores;
private ListView mDrawerList;
private ArrayAdapter<String> mAdapter;
private ActionBarDrawerToggle mDrawerToggle;
private DrawerLayout mDrawerLayout;
//For Audio///////////////////////////////////////////////////////////////////////////
private static final int REQUEST_RECORD_AUDIO_PERMISSION = 200;
......@@ -105,6 +122,8 @@ public class EditPictoActivity extends Activity {
BotonCircular botonReproducir;
BotonCircular botonBorrar;
GifTextView gifRecord;
SeekBar barraReproducir;
......@@ -209,6 +228,45 @@ public class EditPictoActivity extends Activity {
requestWindowFeature(Window.FEATURE_NO_TITLE);
setContentView(R.layout.edit_picto_layout);
mDrawerList = (ListView)findViewById(R.id.navList);
/**Obtener la lista de supervisores y aplicarle formato*/
String supervisors = PCBcontext.getPcbdb().getCurrentUser().get_Supervisors();
ArrayList<String> supervisores = new ArrayList<>();
if(supervisors != null) {
String[] separated = supervisors.split(";");
for (String supervisor : separated) {
String[] detalles = supervisor.split(",");
supervisores.add(detalles[0] + "\n" + detalles[1]);
}
}
mAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, supervisores);
mDrawerList.setAdapter(mAdapter);
mDrawerLayout = (DrawerLayout)findViewById(R.id.drawer_layout);
mDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout,
R.string.drawer_open, R.string.drawer_close) {
/** Called when a drawer has settled in a completely open state. */
public void onDrawerOpened(View drawerView) {
super.onDrawerOpened(drawerView);
invalidateOptionsMenu();
}
/** Called when a drawer has settled in a completely closed state. */
public void onDrawerClosed(View view) {
super.onDrawerClosed(view);
invalidateOptionsMenu();
}
};
mDrawerToggle.setDrawerIndicatorEnabled(true);
mDrawerLayout.setDrawerListener(mDrawerToggle);
dirImagePath = Environment.getExternalStorageDirectory() + File.separator + Environment.DIRECTORY_DCIM;
dirImagePath += "/PictoImages";
File fileImage = new File(dirImagePath);
......@@ -310,10 +368,21 @@ public class EditPictoActivity extends Activity {
desplegableSupervisores.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
User currentUser = PCBcontext.getPcbdb().getCurrentUser();
Log.i(DEBUG_MESSAGE,"Supervisores:"+currentUser.get_Supervisors());
if (mDrawerLayout.isDrawerOpen(Gravity.RIGHT))
mDrawerLayout.closeDrawer(Gravity.RIGHT);
else
mDrawerLayout.openDrawer(Gravity.RIGHT);
}
});
// Set the list's click listener
mDrawerList.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
Toast.makeText(EditPictoActivity.this, "Supervisor: " + mDrawerList.getAdapter().getItem(position), Toast.LENGTH_SHORT).show();
}
});
//Gestion de botones
okButton.setOnClickListener(new View.OnClickListener() {
@Override
......
android/Pictogram/tabletlibrary/src/main/res/layout/edit_picto_layout.xml
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
<android.support.v4.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:id="@+id/TotalLayout"
android:background="@android:color/white">
<TextView
android:id="@+id/crop_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:background="@color/VerdeApp"
android:paddingBottom="8dp"
android:paddingTop="@dimen/content_padding_half"
android:text="@string/titleCropperNew"
android:textAlignment="center"
android:textColor="@color/BlancoApp"
android:textSize="24sp" />
android:layout_height="match_parent">
<!-- The main content view -->
<LinearLayout
android:orientation="horizontal"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:id="@+id/crop_legend"
android:layout_gravity="center_horizontal">
android:layout_height="match_parent"
android:orientation="vertical"
android:id="@+id/TotalLayout"
android:background="@android:color/white">
<TextView
android:id="@+id/crop_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:background="@color/VerdeApp"
android:paddingBottom="8dp"
android:paddingTop="@dimen/content_padding_half"
android:text="@string/titleCropperNew"
android:textAlignment="center"
android:textColor="@color/BlancoApp"
android:textSize="24sp" />
<LinearLayout
android:id="@+id/image_layout"
android:layout_width="wrap_content"
android:orientation="horizontal"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/activity_vertical_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
android:gravity="center"
android:orientation="horizontal">
android:layout_width="match_parent"
android:id="@+id/crop_legend"
android:layout_gravity="center_horizontal">
<com.yottacode.pictogram.tabletlibrary.gui.communicator.cropper.CropImageView
android:id="@+id/CropImageView"
<LinearLayout
android:id="@+id/image_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:adjustViewBounds="true"
android:cropToPadding="false"
android:orientation="horizontal"
android:scaleType="centerInside" />
</LinearLayout>
<LinearLayout
android:id="@+id/botonera"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginRight="25dp"
android:orientation="vertical">
<com.yottacode.pictogram.tabletlibrary.gui.communicator.BotonCircular
android:id="@+id/camara"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_alignParentBottom="false"
android:layout_centerHorizontal="false"
android:layout_weight="0.01"
android:background="#00ffffff"
android:src="@drawable/photo_camera" />
<com.yottacode.pictogram.tabletlibrary.gui.communicator.BotonCircular
android:id="@+id/galeria"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_alignParentBottom="false"
android:layout_centerHorizontal="false"
android:layout_weight="0.02"
android:background="#00ffffff"
android:src="@drawable/photo_gallery" />
</LinearLayout>
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@android:color/darker_gray"
android:layout_marginRight="@dimen/activity_vertical_margin" />
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/activity_vertical_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
android:gravity="center"
android:orientation="horizontal">
<FrameLayout
android:id="@+id/legend_menu"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="right"
android:gravity="center"
android:orientation="vertical"
android:paddingRight="5dp"
android:weightSum="1">
<com.yottacode.pictogram.tabletlibrary.gui.communicator.cropper.CropImageView
android:id="@+id/CropImageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:adjustViewBounds="true"
android:cropToPadding="false"
android:orientation="horizontal"
android:scaleType="centerInside" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:id="@+id/botonera"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginRight="25dp"
android:orientation="vertical">
<TextView
android:id="@+id/textAssociated"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Asociar a:"
android:textColor="@color/gray"
android:textSize="20sp" />
<com.yottacode.pictogram.tabletlibrary.gui.communicator.BotonCircular
android:id="@+id/camara"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_alignParentBottom="false"
android:layout_centerHorizontal="false"
android:layout_weight="0.01"
android:background="#00ffffff"
android:src="@drawable/photo_camera" />
<com.yottacode.pictogram.tabletlibrary.gui.communicator.BotonCircular
android:id="@+id/galeria"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_alignParentBottom="false"
android:layout_centerHorizontal="false"
android:layout_weight="0.02"
android:background="#00ffffff"
android:src="@drawable/photo_gallery" />
<Button
android:id="@+id/botonDesplegable"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Ver" />
</LinearLayout>
<TextView
android:id="@+id/textLegend"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/legendText"
android:textColor="@color/gray"
android:textSize="20sp" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@android:color/darker_gray"
android:layout_marginRight="@dimen/activity_vertical_margin" />
<EditText
android:id="@+id/edtLegend"
<FrameLayout
android:id="@+id/legend_menu"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="right"
android:gravity="center"
android:orientation="vertical"
android:paddingRight="5dp"
android:weightSum="1">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/textLegend"
android:layout_gravity="center"
android:background="@drawable/editpicto_edittext_style"
android:ems="10"
android:gravity="center"
android:imeOptions="actionDone"
android:maxLines="1"
android:textColor="@color/black"
android:textColorLink="?android:attr/colorAccent"
android:textCursorDrawable="@null"
android:textSize="20sp" />
<TextView
android:id="@+id/textView_Audio"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="Audio"
android:textColor="@color/gray"
android:textSize="20sp" />
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="5dp">
<TextView
android:id="@+id/textAssociated"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Asociar a:"
android:textColor="@color/gray"
android:textSize="20sp" />
<LinearLayout
android:id="@+id/layout_record"
<Button
android:id="@+id/botonDesplegable"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:gravity="center"
android:orientation="horizontal"
android:paddingTop="5dp"
android:visibility="visible"
android:weightSum="1">
android:layout_height="wrap_content"
android:layout_marginBottom="15dp"
android:text="Ver" />
<TextView
android:id="@+id/textLegend"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/legendText"
android:textColor="@color/gray"
android:textSize="20sp" />
<pl.droidsonroids.gif.GifTextView
android:id="@+id/recordImage"
android:layout_width="14dp"
android:layout_height="20dp"
android:layout_gravity="center"
android:layout_weight="0.36"
android:background="@color/white" />
<EditText
android:id="@+id/edtLegend"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/textLegend"
android:layout_gravity="center"
android:layout_marginBottom="15dp"
android:background="@drawable/editpicto_edittext_style"
android:ems="10"
android:gravity="center"
android:imeOptions="actionDone"
android:maxLines="1"
android:textColor="@color/black"
android:textColorLink="?android:attr/colorAccent"
android:textCursorDrawable="@null"
android:textSize="20sp" />
<TextView
android:id="@+id/textView_Audio"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="Audio"
android:textColor="@color/gray"
android:textSize="20sp" />
<TextView
android:id="@+id/tiempoActual"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:paddingLeft="5dp"
android:paddingRight="16dp"
android:text="00:00 | 00:10"
android:textColor="@color/VerdeApp" />
<com.yottacode.pictogram.tabletlibrary.gui.communicator.BotonCircular
android:id="@+id/botonGrabar"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_alignParentBottom="false"
android:layout_centerHorizontal="false"
android:background="#00ffffff"
android:clickable="true"
android:src="@drawable/micro" />
</LinearLayout>
<LinearLayout
android:id="@+id/layoutPreview"
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:background="@color/BlancoApp"
android:orientation="vertical"
android:paddingBottom="5dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingTop="5dp"
android:visibility="invisible">
<TextView
android:id="@+id/textView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.02"
android:text="Preview"
android:textAlignment="center"
android:textColor="@android:color/black" />
android:layout_marginTop="5dp">
<LinearLayout
android:id="@+id/LinearLayout"
android:id="@+id/layout_record"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:gravity="center"
android:orientation="horizontal">
android:orientation="horizontal"
android:paddingTop="5dp"
android:visibility="visible"
android:weightSum="1">
<pl.droidsonroids.gif.GifTextView
android:id="@+id/recordImage"
android:layout_width="14dp"
android:layout_height="20dp"
android:layout_gravity="center"
android:layout_weight="0.36"
android:background="@color/white" />
<TextView
android:id="@+id/tiempoActual"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:paddingLeft="5dp"
android:paddingRight="16dp"
android:text="00:00 | 00:10"
android:textColor="@color/VerdeApp" />
<com.yottacode.pictogram.tabletlibrary.gui.communicator.BotonCircular
android:id="@+id/reproducir"
android:layout_width="48dp"
android:layout_height="48dp"
android:id="@+id/botonGrabar"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_alignParentBottom="false"
android:layout_centerHorizontal="false"
android:background="#00ffffff"
android:src="@android:drawable/ic_media_play" />
android:clickable="true"
android:src="@drawable/micro" />
<LinearLayout
android:layout_width="wrap_content"
</LinearLayout>
<LinearLayout
android:id="@+id/layoutPreview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:background="@color/BlancoApp"
android:orientation="vertical"
android:paddingBottom="5dp"
android:paddingLeft="5dp"
android:paddingRight="5dp"
android:paddingTop="5dp"
android:visibility="invisible">
<TextView
android:id="@+id/textView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0.00"
android:orientation="vertical">
<SeekBar
android:id="@+id/barraReproducir"
style="@style/Widget.AppCompat.SeekBar"
android:layout_width="125dp"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tiempoTotal"
android:layout_width="match_parent"
android:layout_weight="0.02"
android:text="Preview"
android:textAlignment="center"
android:textColor="@android:color/black" />
<LinearLayout
android:id="@+id/LinearLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="horizontal">
<com.yottacode.pictogram.tabletlibrary.gui.communicator.BotonCircular
android:id="@+id/reproducir"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_alignParentBottom="false"
android:layout_centerHorizontal="false"
android:background="#00ffffff"
android:src="@android:drawable/ic_media_play" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="top|center"
android:text="00:00 | 00:00"
android:textColor="@color/VerdeApp" />
android:layout_weight="0.00"
android:orientation="vertical">
<SeekBar
android:id="@+id/barraReproducir"
style="@style/Widget.AppCompat.SeekBar"
android:layout_width="125dp"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/tiempoTotal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="top|center"
android:text="00:00 | 00:00"
android:textColor="@color/VerdeApp" />
</LinearLayout>
<com.yottacode.pictogram.tabletlibrary.gui.communicator.BotonCircular
android:id="@+id/botonBorrar"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_alignParentBottom="false"
android:layout_centerHorizontal="false"
android:background="#00ffffff"
android:src="@android:drawable/ic_menu_delete" />
</LinearLayout>
<com.yottacode.pictogram.tabletlibrary.gui.communicator.BotonCircular
android:id="@+id/botonBorrar"
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_alignParentBottom="false"
android:layout_centerHorizontal="false"
android:background="#00ffffff"
android:src="@android:drawable/ic_menu_delete" />
</LinearLayout>
</LinearLayout>
</FrameLayout>
</FrameLayout>
</LinearLayout>
<LinearLayout
android:layout_width="260dp"
android:layout_height="wrap_content"
android:layout_gravity="bottom|center"
android:layout_marginBottom="10dp"
android:gravity="bottom|center_horizontal"
android:orientation="horizontal">
</LinearLayout>
<Button
android:id="@+id/okButton"
android:layout_width="110dp"
<LinearLayout
android:layout_width="260dp"
android:layout_height="wrap_content"
android:text="@string/accept"
android:textAlignment="center"
android:textColor="?android:attr/textColorPrimary"
android:textSize="18sp" />
<Button
android:id="@+id/cancelButton"
android:layout_width="110dp"
android:layout_height="wrap_content"
android:text="@string/cancel"
android:textAlignment="center"
android:textColor="?android:attr/textColorPrimary"
android:textSize="18sp" />
</LinearLayout>
android:layout_gravity="bottom|center"
android:layout_marginBottom="10dp"
android:gravity="bottom|center_horizontal"
android:orientation="horizontal">
<Button
android:id="@+id/okButton"
android:layout_width="110dp"
android:layout_height="wrap_content"
android:text="@string/accept"
android:textAlignment="center"
android:textColor="?android:attr/textColorPrimary"
android:textSize="18sp" />
<Button
android:id="@+id/cancelButton"
android:layout_width="110dp"
android:layout_height="wrap_content"
android:text="@string/cancel"
android:textAlignment="center"
android:textColor="?android:attr/textColorPrimary"
android:textSize="18sp" />
</LinearLayout>
</FrameLayout>
</FrameLayout>
</LinearLayout>
</LinearLayout>
<!-- The navigation drawer -->
<ListView
android:id="@+id/navList"
android:layout_width="250dp"
android:layout_height="match_parent"
android:layout_gravity="right|end"
android:background="#ffeeeeee"/>
</android.support.v4.widget.DrawerLayout>
</LinearLayout>
android/Pictogram/tabletlibrary/src/main/res/values/strings.xml
......@@ -47,4 +47,6 @@
<string name="crop_TextRequired">Por favor, introduzca una leyenda para el pictograma</string>
<string name="uploadingImage">Subiendo imagen al servidor</string>
<string name="cancel">Cancel</string>
<string name="drawer_open">Open Menu</string>
<string name="drawer_close">Close Menu</string>
</resources>
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