Skip to content

yotta / pictogram

Go to a project
Commit 4378e15d by Arturo Montejo Ráez
Options

merged

parents 47ac1632 27613aec
Inline Side-by-side
Showing with 156 additions and 60 deletions
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictoMenu.java
...@@ -53,9 +53,52 @@ public class PictoMenu { ...@@ -53,9 +53,52 @@ public class PictoMenu {
* @param col * @param col
* @param expression * @param expression
*/ */
public void addPicto( final int row, final int col, final int cat, final String expression) { public void createMenuForNewPicto(final int row, final int col, final int cat, final String expression, boolean is_picto_big) {
final String[] items = new String[]{activity.getString(R.string.dialogCamera), activity.getString(R.string.dialogGallery)}; ll = new RelativeLayout(PCBcontext.getContext());
RelativeLayout.LayoutParams params = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.MATCH_PARENT,
RelativeLayout.LayoutParams.MATCH_PARENT);
activity.addContentView(ll, params);
ll.setBackgroundColor(argb(180,0,0,0));
detail = new ImageView(PCBcontext.getContext());
int centerX = activity.getResources().getDisplayMetrics().widthPixels/2;
int centerY = activity.getResources().getDisplayMetrics().heightPixels/2;
if(!is_picto_big){
centerY += 100;
detail.setMaxWidth(90);
}else{
centerY += 135;
detail.setMaxWidth(115);
}
PieMenu = new RadialMenuWidget(PCBcontext.getContext());
PieMenu.setAnimationSpeed(0L);
PieMenu.setCenterLocation(centerX - (PieMenu.getcRadius()*2) - 50, centerY-(PieMenu.getcRadius()*2));
PieMenu.setIconSize(20,35); //Tamaño del icono
Picto picto = null;
PieMenu.setCenterCircle(new Close());
PieMenu.addMenuEntry(new newPickFromCamera(row,col,cat,expression));
PieMenu.addMenuEntry(new newPickFromGallery(row,col,cat,expression));
ll.addView(PieMenu);
detail.setImageResource(R.color.black);
detail.setMaxWidth(96);
detail.setMaxHeight(96);
detail.setX(centerX+10);
detail.setY(centerY - 96);
ll.addView(detail);
/*final String[] items = new String[]{activity.getString(R.string.dialogCamera), activity.getString(R.string.dialogGallery)};
ArrayAdapter<String> adapter = new ArrayAdapter<>(activity, android.R.layout.select_dialog_item, items); ArrayAdapter<String> adapter = new ArrayAdapter<>(activity, android.R.layout.select_dialog_item, items);
AlertDialog.Builder builder = new AlertDialog.Builder(activity); AlertDialog.Builder builder = new AlertDialog.Builder(activity);
...@@ -73,7 +116,7 @@ public class PictoMenu { ...@@ -73,7 +116,7 @@ public class PictoMenu {
} }
}); });
final AlertDialog dialog = builder.create(); final AlertDialog dialog = builder.create();
dialog.show(); dialog.show();*/
} }
...@@ -112,7 +155,7 @@ public class PictoMenu { ...@@ -112,7 +155,7 @@ public class PictoMenu {
* @param resultCode * @param resultCode
* @param data * @param data
*/ */
public void onActivityResult(int requestCode, int resultCode, Intent data) { /*public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (resultCode == Activity.RESULT_OK) { if (resultCode == Activity.RESULT_OK) {
if (requestCode == SELECT_PICTURE) { if (requestCode == SELECT_PICTURE) {
...@@ -131,7 +174,7 @@ public class PictoMenu { ...@@ -131,7 +174,7 @@ public class PictoMenu {
//chooseTextAndSavePicto(selectedImagePath, row, col, freeRow, freeColumn); //chooseTextAndSavePicto(selectedImagePath, row, col, freeRow, freeColumn);
} }
} }
} }*/
/** /**
* Función para la selección de una foto del carrete * Función para la selección de una foto del carrete
...@@ -196,7 +239,7 @@ public class PictoMenu { ...@@ -196,7 +239,7 @@ public class PictoMenu {
PieMenu.setCenterLocation(centerX - (PieMenu.getcRadius()*2) - 50, centerY-(PieMenu.getcRadius()*2)); PieMenu.setCenterLocation(centerX - (PieMenu.getcRadius()*2) - 50, centerY-(PieMenu.getcRadius()*2));
PieMenu.setIconSize(20,35); //Tamaño del icono PieMenu.setIconSize(20,35); //Tamaño del icono
PieMenu.setCenterCircle(new Close(picto)); PieMenu.setCenterCircle(new Close());
PieMenu.addMenuEntry(new UnlockPictoMenu(picto)); PieMenu.addMenuEntry(new UnlockPictoMenu(picto));
PieMenu.addMenuEntry(new DisablePictoMenu(picto)); PieMenu.addMenuEntry(new DisablePictoMenu(picto));
PieMenu.addMenuEntry(new SetInvisibleMenu(picto)); PieMenu.addMenuEntry(new SetInvisibleMenu(picto));
...@@ -219,9 +262,7 @@ public class PictoMenu { ...@@ -219,9 +262,7 @@ public class PictoMenu {
//Close menu button //Close menu button
public class Close implements RadialMenuWidget.RadialMenuEntry public class Close implements RadialMenuWidget.RadialMenuEntry
{ {
Picto p; public Close(){
public Close(Picto picto){
p = picto;
} }
public String getName() { return "Close"; } public String getName() { return "Close"; }
public String getLabel() { return null; } public String getLabel() { return null; }
...@@ -245,7 +286,7 @@ public class PictoMenu { ...@@ -245,7 +286,7 @@ public class PictoMenu {
} }
public String getName() { return "disable"; } public String getName() { return "disable"; }
public String getLabel() { return null; } public String getLabel() { return null; }
public int getIcon() { return R.drawable.disabled_picto; } public int getIcon() { return android.R.drawable.ic_delete; }
public List<RadialMenuWidget.RadialMenuEntry> getChildren() { return null; } public List<RadialMenuWidget.RadialMenuEntry> getChildren() { return null; }
public void menuActiviated() public void menuActiviated()
{ {
...@@ -324,7 +365,6 @@ public class PictoMenu { ...@@ -324,7 +365,6 @@ public class PictoMenu {
} }
} }
//Edit legend text of picto button
public class PickFromCamera implements RadialMenuWidget.RadialMenuEntry public class PickFromCamera implements RadialMenuWidget.RadialMenuEntry
{ {
Picto p; Picto p;
...@@ -363,4 +403,51 @@ public class PictoMenu { ...@@ -363,4 +403,51 @@ public class PictoMenu {
} }
public void menuDisabled(){} public void menuDisabled(){}
} }
public class newPickFromCamera implements RadialMenuWidget.RadialMenuEntry
{
int row,col,cat;
String expression;
public newPickFromCamera(int row, int col,int cat,String expression){
this.row = row;
this.col = col;
this.cat = cat;
this.expression = expression;
}
public String getName() { return ""; }
public String getLabel() { return null; }
public int getIcon() { return android.R.drawable.ic_menu_camera; }
public List<RadialMenuWidget.RadialMenuEntry> getChildren() { return null; }
public void menuActiviated()
{
ll.setVisibility(View.GONE);
ll.removeAllViewsInLayout();
addPicto(row,col,cat,expression,0);
}
public void menuDisabled(){}
}
public class newPickFromGallery implements RadialMenuWidget.RadialMenuEntry
{
int row,col,cat;
String expression;
public newPickFromGallery(int row, int col,int cat,String expression){
this.row = row;
this.col = col;
this.cat = cat;
this.expression = expression;
}
public String getName() { return ""; }
public String getLabel() { return null; }
public int getIcon() { return android.R.drawable.ic_menu_gallery; }
public List<RadialMenuWidget.RadialMenuEntry> getChildren() { return null; }
public void menuActiviated()
{
ll.setVisibility(View.GONE);
ll.removeAllViewsInLayout();
addPicto(row,col,cat,expression,1);
}
public void menuDisabled(){}
}
} }
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictogramActivity.java
...@@ -841,7 +841,7 @@ public class PictogramActivity extends Activity implements VocabularyTalk.iVocab ...@@ -841,7 +841,7 @@ public class PictogramActivity extends Activity implements VocabularyTalk.iVocab
if (p == null) { if (p == null) {
// No tengo pictograma. Abro una nueva ventana de selección desde el Carrete del device si no es categoria // No tengo pictograma. Abro una nueva ventana de selección desde el Carrete del device si no es categoria
if (getCurrentCategory() != null || !PCBcontext.getPcbdb().getCurrentUser().has_categories()) { if (getCurrentCategory() != null || !PCBcontext.getPcbdb().getCurrentUser().has_categories()) {
new PictoMenu(PictogramActivity.this).addPicto(position % maxColumns, (int) (position / maxColumns), currentCategory.get_id(),null); new PictoMenu(PictogramActivity.this).createMenuForNewPicto(position % maxColumns, (int) (position / maxColumns), currentCategory.get_id(),null,PCBcontext.getPcbdb().getCurrentUser().is_picto_size_big());
} else } else
Toast.makeText(PictogramActivity.this, PictogramActivity.this.getResources().getString(R.string.notNewCats), Toast.LENGTH_SHORT).show(); Toast.makeText(PictogramActivity.this, PictogramActivity.this.getResources().getString(R.string.notNewCats), Toast.LENGTH_SHORT).show();
......
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/cropper/EditPictoActivity.java
...@@ -49,7 +49,7 @@ public class EditPictoActivity extends Activity { ...@@ -49,7 +49,7 @@ public class EditPictoActivity extends Activity {
getWindowManager().getDefaultDisplay().getMetrics(metrics); getWindowManager().getDefaultDisplay().getMetrics(metrics);
LinearLayout ll = (LinearLayout)findViewById(R.id.image_layout); LinearLayout ll = (LinearLayout)findViewById(R.id.image_layout);
Log.i("DETALLES", "Tam menu imagen: "+ ll.getLayoutParams().width); Log.i("DETALLES", "Tam menu imagen: "+ ll.getLayoutParams().width);
ll.getLayoutParams().width = (int) (metrics.widthPixels * 0.75 ) - (int) getResources().getDimension(R.dimen.activity_vertical_margin); ll.getLayoutParams().width = (int) (metrics.widthPixels * 0.75 ) - (int) getResources().getDimension(R.dimen.activity_vertical_margin) *2;
Log.i("DETALLES", "Tam menu imagen: "+ ll.getLayoutParams().width); Log.i("DETALLES", "Tam menu imagen: "+ ll.getLayoutParams().width);
ll.requestLayout(); ll.requestLayout();
......
android/Pictogram/tabletlibrary/src/main/res/layout/edit_picto_layout.xml
...@@ -7,20 +7,19 @@ ...@@ -7,20 +7,19 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:id="@+id/TotalLayout" android:id="@+id/TotalLayout"
android:background="@color/black_translucent"> android:background="@android:color/white">
<TextView <TextView
android:paddingTop="@dimen/content_padding" android:paddingTop="@dimen/content_padding_half"
android:id="@+id/crop_title" android:id="@+id/crop_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/titleCropper" android:text="@string/titleCropper"
android:textSize="24sp" android:textSize="24sp"
android:textStyle="bold" android:textColor="@color/black"
android:textColor="@android:color/holo_blue_light"
android:textAlignment="center" android:textAlignment="center"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
/> android:background="@color/gray_blue" />
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
...@@ -50,20 +49,13 @@ ...@@ -50,20 +49,13 @@
</LinearLayout> </LinearLayout>
<!-- <LinearLayout <View
android:orientation="vertical" android:layout_width="1dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_width="wrap_content" android:background="@android:color/darker_gray"
android:id="@+id/legend_menu" android:layout_marginRight="@dimen/activity_vertical_margin" />
android:layout_gravity="right"
android:layout_marginRight="@dimen/activity_vertical_margin"
android:weightSum="1"
android:layout_marginTop="@dimen/activity_vertical_margin"
android:gravity="center_vertical|center">-->
<FrameLayout <FrameLayout
android:orientation="vertical" android:orientation="vertical"
android:background="#000000"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:id="@+id/legend_menu" android:id="@+id/legend_menu"
...@@ -79,17 +71,17 @@ ...@@ -79,17 +71,17 @@
android:orientation="vertical" android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"> android:layout_gravity="center_vertical"
android:layout_marginBottom="40dp">
<TextView <TextView
android:textColor= "#33B5E5" android:textColor= "@color/gray"
android:textSize="20sp" android:textSize="20sp"
android:text="@string/legendText" android:text="@string/legendText"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/textLegend" android:id="@+id/textLegend"
android:layout_gravity="center" android:layout_gravity="center" />
android:gravity="center" />
<EditText <EditText
android:textSize="20sp" android:textSize="20sp"
...@@ -98,10 +90,14 @@ ...@@ -98,10 +90,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ems="10" android:ems="10"
android:id="@+id/edtLegend" android:id="@+id/edtLegend"
android:textColor="@android:color/white" android:textColor="@color/black"
android:layout_below="@+id/textLegend" android:layout_below="@+id/textLegend"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center" /> android:gravity="center"
android:textColorLink="?android:attr/colorAccent"
android:maxLines="1"
android:textCursorDrawable="@null"
/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -110,36 +106,37 @@ ...@@ -110,36 +106,37 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom" android:layout_gravity="bottom"
android:gravity="bottom|center_horizontal" android:gravity="bottom|center_horizontal"
android:layout_marginBottom="@dimen/activity_horizontal_margin"> android:layout_marginBottom="40dp">
<Button <Button
android:id="@+id/cancelButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#33B5E5"
android:textSize="20sp"
android:textAlignment="center"
android:text="@string/cancel"
android:gravity="center_horizontal"
android:layout_marginRight="10dp" />
<Button
android:id="@+id/okButton" android:id="@+id/okButton"
android:layout_width="wrap_content" android:layout_width="120dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="#33B5E5" android:textColor="?android:attr/textColorPrimary"
android:textSize="20sp" android:textSize="18sp"
android:textAlignment="center" android:textAlignment="center"
android:text="@string/accept" android:text="@string/accept"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:layout_marginLeft="10dp" /> android:layout_marginLeft="10dp"
android:capitalize="sentences" />
</LinearLayout> <Button
android:id="@+id/cancelButton"
android:layout_height="wrap_content"
android:textColor="?android:attr/textColorPrimary"
android:textSize="18sp"
android:textAlignment="center"
android:text="@string/cancel"
android:gravity="center_horizontal"
android:layout_marginRight="10dp"
android:capitalize="sentences"
android:layout_width="120dp" />
</LinearLayout>
</FrameLayout> </FrameLayout>
<!--</LinearLayout>-->
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<!--</FrameLayout>-->
android/Pictogram/tabletlibrary/src/main/res/values/colors.xml
...@@ -3,6 +3,12 @@ ...@@ -3,6 +3,12 @@
<color name="white_translucent">#AAFFFFFF</color> <color name="white_translucent">#AAFFFFFF</color>
<color name="black_translucent">#b4000000</color> <color name="black_translucent">#b4000000</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
<color name="gray_blue">#FF78909C</color>
<color name="blue_light">#FF40C4FF</color>
<color name="gray">#FF727272</color>
<color name="border">@color/white_translucent</color> <color name="border">@color/white_translucent</color>
<color name="guideline">@color/white_translucent</color> <color name="guideline">@color/white_translucent</color>
......
sails/src/assets/scripts/modules/student/views/addpicto.html
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
</button> </button>
<h4 class="modal-title" id="myModalLabel" translate ng-show="!onlyOwn">add_picto</h4> <h4 class="modal-title" id="myModalLabel" translate ng-show="!onlyOwn">add_picto</h4>
<h4 class="modal-title" id="myModalLabel" translate ng-show="onlyOwn">own_pictos</h4> <h4 class="modal-title" id="myModalLabel" translate ng-show="onlyOwn">own_pictos</h4>
<hr ng-show="!onlyOwn"> <hr ng-show="!onlyOwn">
<div class="btn-group" ng-show="!onlyOwn"> <div class="btn-group" ng-show="!onlyOwn">
...@@ -20,7 +21,8 @@ ...@@ -20,7 +21,8 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div ng-show="source == 'symbolstx' && !onlyOwn" class="panel panel-default" id="bread_and_categories">
<div id="bread_and_categories" ng-show="source == 'symbolstx' && !onlyOwn" class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<div class="pull-left" ng-repeat="b in breadcrumbs"> <div class="pull-left" ng-repeat="b in breadcrumbs">
<a ng-click="open_category_from_bc(b.id)"> <a ng-click="open_category_from_bc(b.id)">
...@@ -36,7 +38,7 @@ ...@@ -36,7 +38,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div><!-- /bread_and_categories -->
<div> <div>
<alert ng-show="alert.show" ng-model="alert" type="{{alert.type}}" close="closeAlert()">{{alert.msg | translate}}</alert> <alert ng-show="alert.show" ng-model="alert" type="{{alert.type}}" close="closeAlert()">{{alert.msg | translate}}</alert>
...@@ -81,13 +83,17 @@ ...@@ -81,13 +83,17 @@
</a> </a>
</div> </div>
</div> </div>
</div>
<div class="clearfix"></div> <div class="clearfix"></div>
</div>
</div><!-- /collections -->
</div><!-- /row -->
</div> <!-- /modal-body --> </div> <!-- /modal-body -->
<div class="modal-footer"> <div class="modal-footer">
<button class="btn btn-primary" ng-click="cancel()">{{ 'close' | translate }}</button> <button class="btn btn-primary" ng-click="cancel()">{{ 'close' | translate }}</button>
</div> </div>
</div> </div>
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