refactorizando paquete gui (hay que revisar pictogramActivity)

implementada funcionalidad "entrega de tira"

android/Pictogram/supervisor_tablet/src/main/AndroidManifest.xml

@@ -26,7 +26,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
     <activity
-        android:name="com.yottacode.pictogram.tabletlibrary.gui.SplashScreenActivity"
+        android:name="com.yottacode.pictogram.tabletlibrary.gui.login.SplashScreenActivity"
         android:label="@string/app_name"
         android:screenOrientation="landscape">
         <intent-filter>
@@ -36,7 +36,7 @@
         </intent-filter>
     </activity>
     <activity
-        android:name="com.yottacode.pictogram.tabletlibrary.gui.MainActivity"
+        android:name="com.yottacode.pictogram.tabletlibrary.gui.login.MainActivity"
         android:label="@string/app_name"
         android:screenOrientation="landscape" />
     <activity
@@ -44,12 +44,12 @@
         android:label="@string/title_activity_serial"
         android:screenOrientation="landscape" />
     <activity
-        android:name="com.yottacode.pictogram.tabletlibrary.gui.LoginActivity"
+        android:name="com.yottacode.pictogram.tabletlibrary.gui.login.LoginActivity"
         android:exported="true"
         android:label="@string/title_activity_login_activity_fragments"
         android:screenOrientation="landscape" />
     <activity
-        android:name="com.yottacode.pictogram.tabletlibrary.gui.PictogramActivity"
+        android:name="com.yottacode.pictogram.tabletlibrary.gui.communicator.PictogramActivity"
         android:exported="true"
         android:label="@string/app_name"
         android:launchMode="singleTop"

android/Pictogram/supervisor_tablet/src/main/java/com/yottacode/pictogram/supervisor_tablet/gui/Supervisor_SerialActivity.java

@@ -3,7 +3,7 @@ package com.yottacode.pictogram.supervisor_tablet.gui;
 import android.app.Activity;
 
 import com.yottacode.pictogram.supervisor_tablet.R;
-import com.yottacode.pictogram.tabletlibrary.gui.SerialActivity;
+import com.yottacode.pictogram.tabletlibrary.gui.login.SerialActivity;
 import com.yottacode.tools.GUITools;
 
 /**

android/Pictogram/tabletlibrary/build.gradle

@@ -8,7 +8,7 @@ android {
         targetSdkVersion 22
         versionCode 1
         versionName "1.0"
-        resValue "string", "SerialClass", "com.yottacode.pictogram.tabletlibrary.gui.SerialActivity"
+        resValue "string", "SerialClass", "com.yottacode.pictogram.tabletlibrary.gui.login.SerialActivity"
         resValue "integer", "rows", "5"
         resValue "integer", "columns", "10"
         resValue "integer", "rows_big", "4"

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/PictoGridAdapter.java → android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictoGridAdapter.java

-package com.yottacode.pictogram.tabletlibrary.gui;
+package com.yottacode.pictogram.tabletlibrary.gui.communicator;
 
 import android.view.View;
 import android.view.ViewGroup;

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/PictoItemViewGenerator.java → android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictoItemViewGenerator.java

-package com.yottacode.pictogram.tabletlibrary.gui;
+package com.yottacode.pictogram.tabletlibrary.gui.communicator;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -180,21 +180,19 @@ public class PictoItemViewGenerator {
         pictoImage = (ImageView) convertView.findViewById(R.id.picto_grid_item_image);
         redCrossImage = (ImageView) convertView.findViewById(R.id.picto_grid_item_redcross);
     }
-      layoutWrapper.setVisibility(View.GONE);
       layoutWrapper.setBackground(null);
-      layoutWrapper.setAlpha(0.25f);
+      layoutWrapper.setAlpha(PCBcontext.getPcbdb().getCurrentUser().is_supervisor() ? 0.25f : 0);
       layout.setBackgroundColor(convertView.getResources()
         .getColor(R.color.picto_default_background));
       redCrossImage.setVisibility(View.GONE);
-      pictoImage.setScaleX(1.0f);
-      pictoImage.setScaleY(1.0f);
-      pictoImage.setVisibility(View.GONE);
-
+     // pictoImage.setVisibility(View.GONE);
+      //  layoutWrapper.setVisibility(View.GONE);
       if (picto == null) {
+          pictoImage.setImageBitmap(null);
           if (PCBcontext.getPcbdb().getCurrentUser().is_supervisor()) {
-              layoutWrapper.setVisibility(View.VISIBLE);
               layoutWrapper.setBackground(convertView.getResources()
                   .getDrawable(R.drawable.picto_grid_item_border));
+
           }
       } else {
           if (!picto.is_invisible()) {

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/RadialMenuWidget.java → android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/RadialMenuWidget.java

-package com.yottacode.pictogram.tabletlibrary.gui;
+package com.yottacode.pictogram.tabletlibrary.gui.communicator;
 
 
 import java.util.ArrayList;

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/TapeAdapter.java → android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/TapeAdapter.java

-package com.yottacode.pictogram.tabletlibrary.gui;
+package com.yottacode.pictogram.tabletlibrary.gui.communicator;
 
 
 import android.annotation.TargetApi;
@@ -67,10 +67,13 @@ public class TapeAdapter extends BaseAdapter {
     // ELIMINAR TODOS LOS ITEMS DEL ADAPTADOR
     public void endPlay() {
         if (PCBcontext.getPcbdb().getCurrentUser().delete_tape_after_delivery())
-            pictoLinkedList.clear();
+            clear();
         play = false;
     }
+    public void clear() {
+        pictoLinkedList.clear();
 
+    }
     // DEVUELVE TODOS LOS ELEMENTOS
     public LinkedList<Picto> getAll() {
         return pictoLinkedList;

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/customViewGroup.java → android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/customViewGroup.java

-package com.yottacode.pictogram.tabletlibrary.gui;
+package com.yottacode.pictogram.tabletlibrary.gui.communicator;
 
 import android.content.Context;
 import android.util.Log;

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/CustomList.java → android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/login/CustomList.java

-package com.yottacode.pictogram.tabletlibrary.gui;
+package com.yottacode.pictogram.tabletlibrary.gui.login;
 
 import android.app.Activity;
 import android.graphics.Bitmap;

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/CustomListLogin.java → android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/login/CustomListLogin.java

-package com.yottacode.pictogram.tabletlibrary.gui;
+package com.yottacode.pictogram.tabletlibrary.gui.login;
 
 import android.app.Activity;
 import android.graphics.Bitmap;

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/LoginActivity.java → android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/login/LoginActivity.java

-package com.yottacode.pictogram.tabletlibrary.gui;
+package com.yottacode.pictogram.tabletlibrary.gui.login;
 
 import android.annotation.TargetApi;
 import android.content.Intent;
@@ -15,6 +15,7 @@ import android.widget.TextView;
 
 import com.yottacode.pictogram.net.ImgDownloader;
 import com.yottacode.pictogram.tabletlibrary.R;
+import com.yottacode.pictogram.tabletlibrary.gui.login.SerialActivity;
 import com.yottacode.pictogram.tools.Img;
 import com.yottacode.pictogram.tools.PCBcontext;
 import com.yottacode.tools.GUITools;

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/MainActivity.java → android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/login/MainActivity.java

-package com.yottacode.pictogram.tabletlibrary.gui;
+package com.yottacode.pictogram.tabletlibrary.gui.login;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -10,6 +10,7 @@ import android.view.Window;
 import android.view.WindowManager;
 
 import com.yottacode.pictogram.tabletlibrary.R;
+import com.yottacode.pictogram.tabletlibrary.gui.login.SerialActivity;
 import com.yottacode.pictogram.tools.PCBcontext;
 
 public class MainActivity extends Activity {

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/SerialActivity.java → android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/login/SerialActivity.java

-package com.yottacode.pictogram.tabletlibrary.gui;
+package com.yottacode.pictogram.tabletlibrary.gui.login;
 
 import android.app.Activity;
 import android.content.Context;
@@ -20,6 +20,9 @@ import android.widget.ListView;
 import com.yottacode.pictogram.dao.User;
 import com.yottacode.pictogram.dao.UserLogin;
 import com.yottacode.pictogram.tabletlibrary.R;
+import com.yottacode.pictogram.tabletlibrary.gui.communicator.PictogramActivity;
+import com.yottacode.pictogram.tabletlibrary.gui.login.CustomListLogin;
+import com.yottacode.pictogram.tabletlibrary.gui.login.LoginActivity;
 import com.yottacode.pictogram.tabletlibrary.net.NetServiceTablet;
 import com.yottacode.pictogram.tools.PCBcontext;
 

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/SplashScreenActivity.java → android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/login/SplashScreenActivity.java

-package com.yottacode.pictogram.tabletlibrary.gui;
+package com.yottacode.pictogram.tabletlibrary.gui.login;
 
 
 import android.app.Activity;

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/StudentFragmentGrid.java → android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/login/StudentFragmentGrid.java

-package com.yottacode.pictogram.tabletlibrary.gui;
+package com.yottacode.pictogram.tabletlibrary.gui.login;
 
 import android.app.Fragment;
 import android.app.ProgressDialog;
@@ -17,6 +17,7 @@ import com.yottacode.net.RestapiWrapper;
 import com.yottacode.pictogram.dao.User;
 import com.yottacode.pictogram.net.ImgDownloader;
 import com.yottacode.pictogram.tabletlibrary.R;
+import com.yottacode.pictogram.tabletlibrary.gui.communicator.PictogramActivity;
 import com.yottacode.pictogram.tools.Img;
 import com.yottacode.pictogram.tools.PCBcontext;
 import com.yottacode.tools.GUITools;

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/session/ListInstructionsFragment.java

@@ -15,7 +15,7 @@ import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 
-import com.yottacode.pictogram.tabletlibrary.gui.PictogramActivity;
+import com.yottacode.pictogram.tabletlibrary.gui.communicator.PictogramActivity;
 import com.yottacode.pictogram.tabletlibrary.net.SessionWrapper;
 import com.yottacode.pictogram.tabletlibrary.R;
 import com.yottacode.pictogram.tools.PCBcontext;

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/session/SessionActivity.java

@@ -21,7 +21,7 @@ import android.widget.ToggleButton;
 import com.yottacode.pictogram.dao.User;
 import com.yottacode.pictogram.net.NetService;
 import com.yottacode.pictogram.tabletlibrary.R;
-import com.yottacode.pictogram.tabletlibrary.gui.PictogramActivity;
+import com.yottacode.pictogram.tabletlibrary.gui.communicator.PictogramActivity;
 import com.yottacode.pictogram.tabletlibrary.net.SessionWrapper;
 import com.yottacode.pictogram.tools.PCBcontext;
 import com.yottacode.tools.GUITools;

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/net/NetServiceTablet.java

@@ -8,8 +8,8 @@ import android.util.Log;
 import com.yottacode.pictogram.dao.User;
 import com.yottacode.pictogram.net.NetService;
 import com.yottacode.pictogram.tabletlibrary.R;
-import com.yottacode.pictogram.tabletlibrary.gui.PictogramActivity;
-import com.yottacode.pictogram.tabletlibrary.gui.SerialActivity;
+import com.yottacode.pictogram.tabletlibrary.gui.communicator.PictogramActivity;
+import com.yottacode.pictogram.tabletlibrary.gui.login.SerialActivity;
 import com.yottacode.pictogram.tools.PCBcontext;
 
 /**

android/Pictogram/tabletlibrary/src/main/res/layout/activity_login.xml

@@ -3,7 +3,7 @@
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:orientation="horizontal"
-    tools:context="com.yottacode.pictogram.tabletlibrary.gui.LoginActivity">
+    tools:context="com.yottacode.pictogram.tabletlibrary.gui.login.LoginActivity">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -82,7 +82,7 @@
         <fragment
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            class="com.yottacode.pictogram.tabletlibrary.gui.StudentFragmentGrid"
+            class="com.yottacode.pictogram.tabletlibrary.gui.login.StudentFragmentGrid"
             android:id="@+id/loginStudentGrid"
             android:layout_gravity="center"
             tools:layout="@layout/fragment_new_student" />

android/Pictogram/tabletlibrary/src/main/res/layout/activity_pictogram.xml

@@ -6,7 +6,7 @@
     android:background="#BDBDBD"
     android:keepScreenOn="true"
     android:id="@+id/pictogramLayout"
-    tools:context="com.yottacode.pictogram.tabletlibrary.gui.PictogramActivity"
+    tools:context="com.yottacode.pictogram.tabletlibrary.gui.communicator.PictogramActivity"
     android:padding="@dimen/small_padding">
     <!-- android:keepScreenOn - To keep the screen bright as long as the app is visible (also forever)  -->
 

android/Pictogram/tabletlibrary/src/main/res/layout/activity_pictogram_big.xml

@@ -6,7 +6,7 @@
     android:background="#BDBDBD"
     android:keepScreenOn="true"
     android:id="@+id/pictogramLayout"
-    tools:context="com.yottacode.pictogram.tabletlibrary.gui.PictogramActivity"
+    tools:context="com.yottacode.pictogram.tabletlibrary.gui.communicator.PictogramActivity"
     android:padding="@dimen/small_padding">
     <!-- android:keepScreenOn - To keep the screen bright as long as the app is visible (also forever)  -->
 

android/Pictogram/tabletlibrary/src/main/res/layout/activity_splash_screen.xml

@@ -5,7 +5,7 @@
     android:paddingLeft="10dp"
     android:paddingRight="15dp"
     android:orientation="vertical"
-    tools:context="com.yottacode.pictogram.tabletlibrary.gui.SplashScreenActivity" >
+    tools:context="com.yottacode.pictogram.tabletlibrary.gui.login.SplashScreenActivity" >
 
     <ImageView
         android:layout_width="400px"

android/Pictogram/yotta_tablet/build.gradle

@@ -18,7 +18,7 @@ android {
         targetSdkVersion 22
         versionCode 1
         versionName "1.0"
-        resValue "string","SerialClass","com.yottacode.pictogram.tabletlibrary.gui.SerialActivity"
+        resValue "string","SerialClass","com.yottacode.pictogram.tabletlibrary.gui.login.SerialActivity"
 //    signingConfig signingConfigs.config
     }
     productFlavors {

android/Pictogram/yotta_tablet/src/main/AndroidManifest.xml

@@ -27,7 +27,7 @@
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
         <activity
-            android:name="com.yottacode.pictogram.tabletlibrary.gui.SplashScreenActivity"
+            android:name="com.yottacode.pictogram.tabletlibrary.gui.login.SplashScreenActivity"
             android:label="@string/app_name"
             android:screenOrientation="landscape">
             <intent-filter>
@@ -37,20 +37,20 @@
             </intent-filter>
         </activity>
         <activity
-            android:name="com.yottacode.pictogram.tabletlibrary.gui.MainActivity"
+            android:name="com.yottacode.pictogram.tabletlibrary.gui.login.MainActivity"
             android:label="@string/app_name"
             android:screenOrientation="landscape" />
         <activity
-            android:name="com.yottacode.pictogram.tabletlibrary.gui.SerialActivity"
+            android:name="com.yottacode.pictogram.tabletlibrary.gui.login.SerialActivity"
             android:label="@string/title_activity_serial"
             android:screenOrientation="landscape" />
         <activity
-            android:name="com.yottacode.pictogram.tabletlibrary.gui.LoginActivity"
+            android:name="com.yottacode.pictogram.tabletlibrary.gui.login.LoginActivity"
             android:exported="true"
             android:label="@string/title_activity_login_activity_fragments"
             android:screenOrientation="landscape" />
         <activity
-            android:name="com.yottacode.pictogram.tabletlibrary.gui.PictogramActivity"
+            android:name="com.yottacode.pictogram.tabletlibrary.gui.communicator.PictogramActivity"
             android:exported="true"
             android:label="@string/app_name"
             android:launchMode="singleTop"

android/Pictogram/yotta_tablet/src/main/java/com/yottacode/pictogram/yotta_tablet/kiosk/BootReceiver.java

@@ -4,6 +4,8 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
+import com.yottacode.pictogram.tabletlibrary.gui.login.MainActivity;
+
 /**
  * Created by emblanco on 13/10/15.
  *
@@ -16,7 +18,7 @@ public class BootReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        Intent myIntent = new Intent(context, com.yottacode.pictogram.tabletlibrary.gui.MainActivity.class);
+        Intent myIntent = new Intent(context, MainActivity.class);
         myIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         context.startActivity(myIntent);
     }

android/Pictogram/yotta_tablet/src/main/java/com/yottacode/pictogram/yotta_tablet/kiosk/KioskService.java

@@ -88,7 +88,7 @@ public class KioskService extends Service {
 
     private void restoreApp() {
         // Restart activity
-        Intent i = new Intent(ctx, com.yottacode.pictogram.tabletlibrary.gui.SerialActivity.class);
+        Intent i = new Intent(ctx, com.yottacode.pictogram.tabletlibrary.gui.login.SerialActivity.class);
         i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         ctx.startActivity(i);
     }