Skip to content

yotta / pictogram

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

some comments on getPictoView

parent 5b062401
Inline Side-by-side
Showing with 36 additions and 27 deletions
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictoItemViewGenerator.java
...@@ -24,6 +24,7 @@ import java.util.ArrayList; ...@@ -24,6 +24,7 @@ import java.util.ArrayList;
* or a picto tape. * or a picto tape.
*/ */
public class PictoItemViewGenerator { public class PictoItemViewGenerator {
public static final int LAYOUT = R.layout.picto_grid_item; public static final int LAYOUT = R.layout.picto_grid_item;
public static final int LAYOUT_BIG = R.layout.picto_grid_item_big; public static final int LAYOUT_BIG = R.layout.picto_grid_item_big;
private static final byte MAX_LINE_LENGTH = 12; private static final byte MAX_LINE_LENGTH = 12;
...@@ -31,7 +32,6 @@ public class PictoItemViewGenerator { ...@@ -31,7 +32,6 @@ public class PictoItemViewGenerator {
private static final String LOG_TAG = PictoItemViewGenerator.class.getCanonicalName(); private static final String LOG_TAG = PictoItemViewGenerator.class.getCanonicalName();
public static int mirror_color=0; public static int mirror_color=0;
/** /**
* *
* @param picto Pictogram to set the legend text * @param picto Pictogram to set the legend text
...@@ -61,19 +61,24 @@ public class PictoItemViewGenerator { ...@@ -61,19 +61,24 @@ public class PictoItemViewGenerator {
} }
/**
*
* @param picto
* @param convertView
* @param parent
* @return
*/
public static View getPictoView(Picto picto, View convertView, ViewGroup parent) { public static View getPictoView(Picto picto, View convertView, ViewGroup parent) {
return getPictoView(picto, convertView, parent, false); return getPictoView(picto, convertView, parent, false);
} }
/** /**
* Establece la visibilidad de los pictogramas
* Pictogramas no habilitados se muestran sólo en VocabularyManager * Pictogramas no habilitados se muestran sólo en VocabularyManager
* @param picto * @param picto Pictogram to show
* @param convertView * @param convertView View object
* @param parent * @param parent
* @param preventMirror * @param preventMirror
* @return * @return Picto view
*/ */
public static View getPictoView(Picto picto, View convertView, ViewGroup parent, boolean preventMirror) { public static View getPictoView(Picto picto, View convertView, ViewGroup parent, boolean preventMirror) {
...@@ -84,12 +89,15 @@ public class PictoItemViewGenerator { ...@@ -84,12 +89,15 @@ public class PictoItemViewGenerator {
TextView legend; TextView legend;
TextView legend_full; TextView legend_full;
// View init
if (convertView == null) if (convertView == null)
convertView = LayoutInflater.from(parent.getContext()).inflate(PCBcontext.getPcbdb().getCurrentUser().is_picto_size_big() ? LAYOUT_BIG : LAYOUT, parent, false); convertView = LayoutInflater.from(parent.getContext()).inflate(PCBcontext.getPcbdb().getCurrentUser().is_picto_size_big() ? LAYOUT_BIG : LAYOUT, parent, false);
if (parent.getId()==R.id.tape_grid_view) // Padding respect to the tape
if (parent.getId() == R.id.tape_grid_view)
convertView.setPadding(0,0,0,0); convertView.setPadding(0,0,0,0);
// Picto size
if (PCBcontext.getPcbdb().getCurrentUser().is_picto_size_big()) { if (PCBcontext.getPcbdb().getCurrentUser().is_picto_size_big()) {
layoutWrapper = (RelativeLayout) convertView.findViewById(R.id.picto_grid_item_layout_wrapper_big); layoutWrapper = (RelativeLayout) convertView.findViewById(R.id.picto_grid_item_layout_wrapper_big);
layout = (FrameLayout) convertView.findViewById(R.id.picto_grid_item_layout_big); layout = (FrameLayout) convertView.findViewById(R.id.picto_grid_item_layout_big);
...@@ -116,6 +124,7 @@ public class PictoItemViewGenerator { ...@@ -116,6 +124,7 @@ public class PictoItemViewGenerator {
pictoImage.setImageBitmap(null); pictoImage.setImageBitmap(null);
layoutWrapper.setAlpha(1f); layoutWrapper.setAlpha(1f);
// Picto visibility
if (PCBcontext.getActivityContext().getClass().getSimpleName().equals("VocabularyManager") || (picto != null && !picto.is_invisible())) { if (PCBcontext.getActivityContext().getClass().getSimpleName().equals("VocabularyManager") || (picto != null && !picto.is_invisible())) {
layoutWrapper.setVisibility(View.VISIBLE); layoutWrapper.setVisibility(View.VISIBLE);
pictoImage.setVisibility(View.VISIBLE); pictoImage.setVisibility(View.VISIBLE);
...@@ -128,20 +137,20 @@ public class PictoItemViewGenerator { ...@@ -128,20 +137,20 @@ public class PictoItemViewGenerator {
switch (picto.get_legend()) { switch (picto.get_legend()) {
case "none": case "none":
legend.setVisibility(View.GONE); legend.setVisibility(View.GONE);
legend_full.setVisibility(View.GONE); legend_full.setVisibility(View.GONE);
break; break;
case "normal": case "normal":
legend.setText(format_legend(picto, MAX_LINE_LENGTH, false)); legend.setText(format_legend(picto, MAX_LINE_LENGTH, false));
legend.setVisibility(View.VISIBLE); legend.setVisibility(View.VISIBLE);
legend_full.setVisibility(View.GONE); legend_full.setVisibility(View.GONE);
break; break;
default: default:
legend_full.setText(format_legend(picto, MAX_LINE_LENGTH_FULL, true)); legend_full.setText(format_legend(picto, MAX_LINE_LENGTH_FULL, true));
legend.setVisibility(View.GONE); legend.setVisibility(View.GONE);
legend_full.setVisibility(View.VISIBLE); legend_full.setVisibility(View.VISIBLE);
} }
pictoImage.setImageBitmap(bm); pictoImage.setImageBitmap(bm);
......
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/VOCA.java
package com.yottacode.pictogram.tabletlibrary.gui.communicator; package com.yottacode.pictogram.tabletlibrary.gui.communicator;
import android.util.Log;
import android.widget.Toast;
import com.yottacode.pictogram.tools.PCBcontext;
/** /**
* Created by scollado on 17/07/17. * Created by scollado on 17/07/17.
*/ */
public class VOCA extends VocabularyViewer { public class VOCA extends VocabularyViewer {
@Override
protected void onResume() {
super.onResume();
PCBcontext.setActivityContext(this);
}
} }
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/VocabularyManager.java 0 → 100644
package com.yottacode.pictogram.tabletlibrary.gui.communicator;
/**
* Created by scollado on 19/07/17.
*/
public class VocabularyManager extends VocabularyViewer {
}
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