Skip to content

yotta / pictogram

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

Captura de mensaje privado hecha (Falta terminarlo visualmente)

parent f3e4ce2e
Inline Side-by-side
Showing with 363 additions and 175 deletions
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/net/websockets/ActionTalk.java
...@@ -71,7 +71,7 @@ public class ActionTalk implements Emitter.Listener { ...@@ -71,7 +71,7 @@ public class ActionTalk implements Emitter.Listener {
: action.equals(action_delete) : action.equals(action_delete)
? iActionListener.action.delete ? iActionListener.action.delete
: iActionListener.action.show : iActionListener.action.show
, picto_cat, picto_id); , picto_cat, picto_id,msg);
} }
...@@ -98,6 +98,6 @@ public class ActionTalk implements Emitter.Listener { ...@@ -98,6 +98,6 @@ public class ActionTalk implements Emitter.Listener {
*/ */
public interface iActionListener { public interface iActionListener {
enum action {add,delete,select,show} enum action {add,delete,select,show}
void action(action action, int picto_cat, int picto_id); void action(action action, int picto_cat, int picto_id,JSONObject msg);
} }
} }
android/Pictogram/tabletlibrary/build.gradle
...@@ -8,7 +8,7 @@ android { ...@@ -8,7 +8,7 @@ android {
targetSdkVersion 22 targetSdkVersion 22
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
resValue "bool","NotifyAllwaysVisible","false" resValue "bool", "NotifyAllwaysVisible", "false"
resValue "integer", "rows", "5" resValue "integer", "rows", "5"
resValue "integer", "columns", "10" resValue "integer", "columns", "10"
resValue "integer", "rows_big", "4" resValue "integer", "rows_big", "4"
......
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/Message_Fragment.java 0 → 100644
package com.yottacode.pictogram.tabletlibrary.gui.communicator;
import android.os.Bundle;
import android.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import com.yottacode.pictogram.tabletlibrary.R;
public class Message_Fragment extends Fragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
View v = inflater.inflate(R.layout.fragment_message, null);
// Inflate the layout for this fragment
return v;
}
public boolean closedFragment(){
this.onDestroy();
return true;
}
}
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictogramActivity.java
...@@ -3,6 +3,8 @@ package com.yottacode.pictogram.tabletlibrary.gui.communicator; ...@@ -3,6 +3,8 @@ package com.yottacode.pictogram.tabletlibrary.gui.communicator;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.FragmentManager;
import android.app.FragmentTransaction;
import android.content.ClipData; import android.content.ClipData;
import android.content.ClipDescription; import android.content.ClipDescription;
import android.content.Context; import android.content.Context;
...@@ -62,6 +64,7 @@ import com.yottacode.pictogram.tts.TTSHelper; ...@@ -62,6 +64,7 @@ import com.yottacode.pictogram.tts.TTSHelper;
import com.yottacode.tools.BitmapTools; import com.yottacode.tools.BitmapTools;
import com.yottacode.tools.GUITools; import com.yottacode.tools.GUITools;
import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
...@@ -160,11 +163,33 @@ public class PictogramActivity extends Activity implements VocabularyTalk.iVocab ...@@ -160,11 +163,33 @@ public class PictogramActivity extends Activity implements VocabularyTalk.iVocab
this.vocabulary = PCBcontext.getVocabulary(); this.vocabulary = PCBcontext.getVocabulary();
this.vocabulary.listen(PCBcontext.getRoom(), this, new ActionTalk.iActionListener() { this.vocabulary.listen(PCBcontext.getRoom(), this, new ActionTalk.iActionListener() {
@Override @Override
public void action(action action, int picto_cat, int picto_id) { public void action(action action, int picto_cat, int picto_id, JSONObject msg) {
if(msg == null)
Log.i("TAG_PRUEBAS","No viene nada de mensaje");
Log.i(this.getClass().getCanonicalName(), action + " from " + picto_cat + "," + picto_id + " catched"); Log.i(this.getClass().getCanonicalName(), action + " from " + picto_cat + "," + picto_id + " catched");
if (action==ActionTalk.iActionListener.action.show) { if (action==ActionTalk.iActionListener.action.show) {
Log.i(LOG_TAG,"show message received:"+action.toString()); Log.i("TAG_PRUEBAS","Llega aqui");
Log.i("TAG_PRUEBAS","show message received:"+msg.toString());
try {
//Log.i("TAG_PRUEBAS","show message received:"+msg.get("expression"));
JSONObject msg_attrs = msg.getJSONObject("attributes");
JSONArray pictos = msg_attrs.getJSONArray("pictos");
for(int i = 0; i < pictos.length(); i++) {
JSONObject picto = pictos.getJSONObject(i).getJSONObject("attributes");
Log.i("TAG_PRUEBAS","picto received:"+picto.get("expression").toString());
}
} catch (JSONException e) {
e.printStackTrace();
}
FragmentManager fragmentManager = getFragmentManager();
FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
Message_Fragment fragment = new Message_Fragment();
fragmentTransaction.add(R.id.fragment_container, fragment, "ALERTA");
fragmentTransaction.commit();
mainLayout.setEnabled(false); //Desactivar el fondo
} }
else if (PCBcontext.getPcbdb().getCurrentUser().is_mirror_on()) { else if (PCBcontext.getPcbdb().getCurrentUser().is_mirror_on()) {
Picto picto = vocabulary.get_picto(picto_cat, picto_id); Picto picto = vocabulary.get_picto(picto_cat, picto_id);
...@@ -172,6 +197,7 @@ public class PictogramActivity extends Activity implements VocabularyTalk.iVocab ...@@ -172,6 +197,7 @@ public class PictogramActivity extends Activity implements VocabularyTalk.iVocab
} }
} }
}); });
this.vocabulary.setImgDownloaderListener(new ImgDownloader.iImgDownloaderListener() { this.vocabulary.setImgDownloaderListener(new ImgDownloader.iImgDownloaderListener() {
@Override @Override
public void loadComplete() { public void loadComplete() {
......
android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/session/SessionFragment.java
...@@ -19,12 +19,12 @@ import com.yottacode.pictogram.tabletlibrary.R; ...@@ -19,12 +19,12 @@ import com.yottacode.pictogram.tabletlibrary.R;
import com.yottacode.pictogram.tools.PCBcontext; import com.yottacode.pictogram.tools.PCBcontext;
import com.yottacode.tools.BitmapTools; import com.yottacode.tools.BitmapTools;
import org.json.JSONObject;
import java.io.IOException; import java.io.IOException;
public class SessionFragment extends Fragment implements ActionTalk.iActionListener { public class SessionFragment extends Fragment implements ActionTalk.iActionListener {
interface iSessionFragment { interface iSessionFragment {
public void selectedMsg(int msg_pos); public void selectedMsg(int msg_pos);
public void play_msg(); public void play_msg();
...@@ -108,7 +108,7 @@ public class SessionFragment extends Fragment implements ActionTalk.iActionListe ...@@ -108,7 +108,7 @@ public class SessionFragment extends Fragment implements ActionTalk.iActionListe
} }
@Override @Override
public void action(action action, int picto_cat, int picto_id) { public void action(action action, int picto_cat, int picto_id,JSONObject msg) {
if (action==ActionTalk.iActionListener.action.show) { if (action==ActionTalk.iActionListener.action.show) {
if (!paused) { if (!paused) {
mListener.play_msg(); mListener.play_msg();
......
android/Pictogram/tabletlibrary/src/main/res/layout/activity_pictogram.xml
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout
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:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -6,95 +7,110 @@ ...@@ -6,95 +7,110 @@
android:orientation="horizontal" android:orientation="horizontal"
android:background="#BDBDBD" android:background="#BDBDBD"
android:keepScreenOn="true" android:keepScreenOn="true"
android:id="@+id/pictogramLayout"
tools:context="com.yottacode.pictogram.tabletlibrary.gui.communicator.PictogramActivity" tools:context="com.yottacode.pictogram.tabletlibrary.gui.communicator.PictogramActivity"
android:padding="@dimen/small_padding"> android:padding="@dimen/small_padding">
<!-- android:keepScreenOn - To keep the screen bright as long as the app is visible (also forever) -->
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/pictogramLayout"
>
<!-- android:keepScreenOn - To keep the screen bright as long as the app is visible (also forever) -->
<ImageButton
android:layout_width="@dimen/picto_normal_width"
android:layout_height="@dimen/tape_normal_height"
android:src="@drawable/remove_picto_from_tape"
android:id="@+id/button_delete"
android:layout_alignParentTop="true"
android:layout_alignParentStart="true"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:clickable="true"
android:background="@android:color/holo_red_light" />
<GridView <ImageButton
android:id="@+id/tape_grid_view" android:layout_width="@dimen/picto_normal_width"
android:layout_toEndOf="@+id/button_delete" android:layout_height="@dimen/tape_normal_height"
android:layout_toStartOf="@+id/button_tts" android:src="@drawable/remove_picto_from_tape"
android:layout_width="@dimen/picto_normal_width" android:id="@+id/button_delete"
android:layout_height="@dimen/tape_normal_height" android:layout_alignParentTop="true"
android:padding="@dimen/small_padding" android:layout_alignParentStart="true"
android:gravity="center" android:paddingLeft="16dp"
android:numColumns="8" android:paddingRight="16dp"
android:accessibilityLiveRegion="none" android:clickable="true"
android:background="@android:color/holo_red_light" android:background="@android:color/holo_red_light" />
android:clickable="true"
android:horizontalSpacing="@dimen/picto_grid_spacing">
</GridView>
<ImageButton <GridView
android:layout_width="@dimen/picto_normal_width" android:id="@+id/tape_grid_view"
android:layout_height="@dimen/tape_normal_height" android:layout_toEndOf="@+id/button_delete"
android:src="@drawable/send_tape" android:layout_toStartOf="@+id/button_tts"
android:background="@android:color/holo_red_light" android:layout_width="@dimen/picto_normal_width"
android:id="@+id/button_tts" android:layout_height="@dimen/tape_normal_height"
android:adjustViewBounds="true" android:padding="@dimen/small_padding"
android:layout_alignParentTop="true" android:gravity="center"
android:layout_alignParentEnd="true" android:numColumns="8"
android:paddingLeft="16dp" android:accessibilityLiveRegion="none"
android:paddingRight="16dp" android:background="@android:color/holo_red_light"
android:clickable="true" /> android:clickable="true"
android:horizontalSpacing="@dimen/picto_grid_spacing">
</GridView>
<ImageButton <ImageButton
android:layout_width="96dp" android:layout_width="@dimen/picto_normal_width"
android:layout_height="match_parent" android:layout_height="@dimen/tape_normal_height"
android:id="@+id/showPictoCategoriesViewButton" android:src="@drawable/send_tape"
android:layout_alignParentStart="true" android:background="@android:color/holo_red_light"
android:src="@drawable/show_categories_grid" android:id="@+id/button_tts"
android:background="#EEEEEE" android:adjustViewBounds="true"
android:layout_below="@+id/tape_grid_view" android:layout_alignParentTop="true"
android:scaleType="fitCenter" /> android:layout_alignParentEnd="true"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:clickable="true" />
<GridView <ImageButton
android:id="@+id/picto_category_grid_view" android:layout_width="96dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_width="match_parent" android:id="@+id/showPictoCategoriesViewButton"
android:layout_below="@+id/tape_grid_view" android:layout_alignParentStart="true"
android:layout_alignParentBottom="true" android:src="@drawable/show_categories_grid"
android:numColumns="10" android:background="#EEEEEE"
android:gravity="center_vertical|center|center_horizontal" android:layout_below="@+id/tape_grid_view"
android:background="#DDDDDD" android:scaleType="fitCenter" />
android:layout_alignParentEnd="true"
android:layout_toEndOf="@+id/showPictoCategoriesViewButton"
android:paddingLeft="@dimen/small_padding"
android:paddingTop="@dimen/small_padding"
android:paddingRight="@dimen/small_padding"
android:paddingBottom="@dimen/small_padding"
android:verticalSpacing="@dimen/picto_grid_spacing"
android:horizontalSpacing="@dimen/picto_grid_spacing">
</GridView>
<GridView <GridView
android:id="@+id/picto_main_grid_view" android:id="@+id/picto_category_grid_view"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_below="@+id/tape_grid_view"
android:layout_alignParentBottom="true"
android:numColumns="10"
android:gravity="center_vertical|center|center_horizontal"
android:background="#DDDDDD"
android:layout_alignParentEnd="true"
android:layout_toEndOf="@+id/showPictoCategoriesViewButton"
android:paddingLeft="@dimen/small_padding"
android:paddingTop="@dimen/small_padding"
android:paddingRight="@dimen/small_padding"
android:paddingBottom="@dimen/small_padding"
android:verticalSpacing="@dimen/picto_grid_spacing"
android:horizontalSpacing="@dimen/picto_grid_spacing">
</GridView>
<GridView
android:id="@+id/picto_main_grid_view"
android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_below="@+id/tape_grid_view"
android:layout_alignParentStart="true"
android:gravity="center_vertical|center|center_horizontal"
android:background="#DDDDDD"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:paddingLeft="@dimen/small_padding"
android:paddingTop="@dimen/small_padding"
android:horizontalSpacing="@dimen/picto_grid_spacing"
android:verticalSpacing="@dimen/picto_grid_spacing">
</GridView>
</RelativeLayout>
<FrameLayout
android:id="@+id/fragment_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_below="@+id/tape_grid_view" android:layout_height="match_parent"
android:layout_alignParentStart="true" android:layout_gravity="center"
android:gravity="center_vertical|center|center_horizontal" android:orientation="horizontal">
android:background="#DDDDDD"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:paddingLeft="@dimen/small_padding"
android:paddingTop="@dimen/small_padding"
android:horizontalSpacing="@dimen/picto_grid_spacing"
android:verticalSpacing="@dimen/picto_grid_spacing">
</GridView>
</RelativeLayout> </FrameLayout>
</FrameLayout>
android/Pictogram/tabletlibrary/src/main/res/layout/activity_pictogram_big.xml
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout
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:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -6,96 +7,109 @@ ...@@ -6,96 +7,109 @@
android:orientation="horizontal" android:orientation="horizontal"
android:background="#BDBDBD" android:background="#BDBDBD"
android:keepScreenOn="true" android:keepScreenOn="true"
android:id="@+id/pictogramLayout"
tools:context="com.yottacode.pictogram.tabletlibrary.gui.communicator.PictogramActivity" tools:context="com.yottacode.pictogram.tabletlibrary.gui.communicator.PictogramActivity"
android:padding="@dimen/small_padding"> android:padding="@dimen/small_padding">
<!-- android:keepScreenOn - To keep the screen bright as long as the app is visible (also forever) -->
<RelativeLayout
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) -->
<ImageButton
android:layout_width="@dimen/picto_big_width"
android:layout_height="@dimen/tape_big_height"
android:src="@drawable/remove_picto_from_tape"
android:id="@+id/button_delete"
android:layout_alignParentTop="true"
android:layout_alignParentStart="true"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:clickable="true"
android:background="@android:color/holo_red_light" />
<GridView
android:id="@+id/tape_grid_view"
android:layout_toEndOf="@+id/button_delete"
android:layout_toStartOf="@+id/button_tts"
android:layout_width="@dimen/picto_big_width"
android:layout_height="@dimen/tape_big_height"
android:padding="@dimen/small_padding"
android:gravity="center"
android:numColumns="6"
android:accessibilityLiveRegion="none"
android:background="@android:color/holo_red_light"
android:clickable="true"
android:longClickable="true"
android:horizontalSpacing="@dimen/picto_grid_spacing">
</GridView>
<ImageButton
android:id="@+id/button_delete"
android:layout_width="@dimen/picto_big_width"
android:layout_height="@dimen/tape_big_height"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:background="@android:color/holo_red_light"
android:clickable="true"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:src="@drawable/remove_picto_from_tape" />
<ImageButton <GridView
android:layout_width="@dimen/picto_big_width" android:id="@+id/tape_grid_view"
android:layout_height="@dimen/tape_big_height" android:layout_width="@dimen/picto_big_width"
android:src="@drawable/send_tape" android:layout_height="@dimen/tape_big_height"
android:background="@android:color/holo_red_light" android:layout_toEndOf="@+id/button_delete"
android:id="@+id/button_tts" android:layout_toStartOf="@+id/button_tts"
android:adjustViewBounds="true" android:accessibilityLiveRegion="none"
android:layout_alignParentTop="true" android:background="@android:color/holo_red_light"
android:layout_alignParentEnd="true" android:clickable="true"
android:paddingLeft="16dp" android:gravity="center"
android:paddingRight="16dp" android:horizontalSpacing="@dimen/picto_grid_spacing"
android:clickable="true" /> android:longClickable="true"
android:numColumns="6"
android:padding="@dimen/small_padding"></GridView>
<ImageButton
android:layout_width="96dp"
android:layout_height="match_parent"
android:id="@+id/showPictoCategoriesViewButton"
android:layout_alignParentStart="true"
android:src="@drawable/show_categories_grid"
android:background="#EEEEEE"
android:layout_below="@+id/tape_grid_view"
android:scaleType="fitCenter" />
<GridView <ImageButton
android:id="@+id/picto_category_grid_view" android:id="@+id/button_tts"
android:layout_height="match_parent" android:layout_width="@dimen/picto_big_width"
android:layout_width="match_parent" android:layout_height="@dimen/tape_big_height"
android:layout_below="@+id/tape_grid_view" android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true" android:layout_alignParentTop="true"
android:numColumns="8" android:adjustViewBounds="true"
android:gravity="center_vertical|center|center_horizontal" android:background="@android:color/holo_red_light"
android:background="#DDDDDD" android:clickable="true"
android:layout_alignParentEnd="true" android:paddingLeft="16dp"
android:layout_toEndOf="@+id/showPictoCategoriesViewButton" android:paddingRight="16dp"
android:paddingLeft="@dimen/small_padding" android:src="@drawable/send_tape" />
android:paddingTop="@dimen/small_padding"
android:paddingRight="@dimen/small_padding"
android:paddingBottom="@dimen/small_padding"
android:verticalSpacing="@dimen/picto_grid_spacing"
android:horizontalSpacing="@dimen/picto_grid_spacing">
</GridView>
<GridView <ImageButton
android:id="@+id/picto_main_grid_view" android:id="@+id/showPictoCategoriesViewButton"
android:layout_height="match_parent" android:layout_width="96dp"
android:layout_height="match_parent"
android:layout_alignParentStart="true"
android:layout_below="@+id/tape_grid_view"
android:background="#EEEEEE"
android:scaleType="fitCenter"
android:src="@drawable/show_categories_grid" />
<GridView
android:id="@+id/picto_category_grid_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_below="@+id/tape_grid_view"
android:layout_toEndOf="@+id/showPictoCategoriesViewButton"
android:background="#DDDDDD"
android:gravity="center_vertical|center|center_horizontal"
android:horizontalSpacing="@dimen/picto_grid_spacing"
android:numColumns="8"
android:paddingBottom="@dimen/small_padding"
android:paddingLeft="@dimen/small_padding"
android:paddingRight="@dimen/small_padding"
android:paddingTop="@dimen/small_padding"
android:verticalSpacing="@dimen/picto_grid_spacing"></GridView>
<GridView
android:id="@+id/picto_main_grid_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/tape_grid_view"
android:background="#DDDDDD"
android:gravity="center_vertical|center|center_horizontal"
android:horizontalSpacing="@dimen/picto_grid_spacing"
android:paddingLeft="@dimen/small_padding"
android:paddingTop="@dimen/small_padding"
android:verticalSpacing="@dimen/picto_grid_spacing"></GridView>
</RelativeLayout>
<FrameLayout
android:id="@+id/fragment_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_below="@+id/tape_grid_view" android:layout_height="match_parent"
android:layout_alignParentStart="true" android:layout_gravity="center"
android:gravity="center_vertical|center|center_horizontal" android:orientation="horizontal">
android:background="#DDDDDD"
android:layout_alignParentBottom="true" </FrameLayout>
android:layout_alignParentEnd="true"
android:paddingLeft="@dimen/small_padding"
android:paddingTop="@dimen/small_padding"
android:horizontalSpacing="@dimen/picto_grid_spacing"
android:verticalSpacing="@dimen/picto_grid_spacing">
</GridView>
</RelativeLayout> </FrameLayout>
android/Pictogram/tabletlibrary/src/main/res/layout/fragment_message.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#99000000"
android:gravity="center"
android:orientation="vertical">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/textView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="5dp"
android:text="¡Alerta!"
android:textAlignment="center"
android:textColor="@android:color/background_light"
android:textSize="24sp"
android:textStyle="bold" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="horizontal">
<ImageView
android:id="@+id/imageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" />
<ImageView
android:id="@+id/imageView5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" />
<ImageView
android:id="@+id/imageView4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" />
<ImageView
android:id="@+id/imageView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" />
<ImageView
android:id="@+id/imageView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp" />
<ImageView
android:id="@+id/imageView8"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_weight="1" />
<ImageView
android:id="@+id/imageView7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_weight="1" />
<ImageView
android:id="@+id/imageView6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_weight="1" />
</LinearLayout>
<Button
android:id="@+id/aceptar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Button"
android:onClick="closedFragment()"/>
</LinearLayout>
</LinearLayout>
android/Pictogram/tabletlibrary/src/main/res/values/colors.xml
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<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="black">#000000</color>
<color name="white">#FFFFFFFF</color> <color name="white">#FFFFFFFF</color>
<color name="gray_blue">#FF78909C</color> <color name="gray_blue">#FF78909C</color>
<color name="blue_light">#40c4ff</color> <color name="blue_light">#40c4ff</color>
......
android/Pictogram/tabletlibrary/src/main/res/values/strings.xml
...@@ -50,4 +50,7 @@ ...@@ -50,4 +50,7 @@
<string name="drawer_open">Open Menu</string> <string name="drawer_open">Open Menu</string>
<string name="drawer_close">Close Menu</string> <string name="drawer_close">Close Menu</string>
<string name="insertPasswordLogin">Inserte Contraseña</string> <string name="insertPasswordLogin">Inserte Contraseña</string>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
</resources> </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