Gradle issue and launcher icons fixed

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

@@ -20,7 +20,7 @@ import com.yottacode.net.RestapiWrapper;
 import com.yottacode.pictogram.dao.User;
 import com.yottacode.pictogram.dao.User;
 import com.yottacode.pictogram.net.ImgDownloader;
 import com.yottacode.pictogram.net.ImgDownloader;
 import com.yottacode.pictogram.supervisor.R;
 import com.yottacode.pictogram.supervisor.R;
-import com.yottacode.pictogram.tabletlibrary.gui.communicator.VOCA;
+import com.yottacode.pictogram.supervisor.gui.VOCAS;
 import com.yottacode.pictogram.tools.Img;
 import com.yottacode.pictogram.tools.Img;
 import com.yottacode.pictogram.tools.PCBcontext;
 import com.yottacode.pictogram.tools.PCBcontext;
 import com.yottacode.tools.GUITools;
 import com.yottacode.tools.GUITools;
@@ -92,7 +92,7 @@ public class StudentFragmentGrid extends Fragment {
                 Log.e(StudentFragmentGrid.this.getClass().getCanonicalName(), e.getMessage());
                 Log.e(StudentFragmentGrid.this.getClass().getCanonicalName(), e.getMessage());
             }
             }
             PCBcontext.set_user(currentUser, null, null);
             PCBcontext.set_user(currentUser, null, null);
-            Intent pictogramActivity = new Intent(getActivity(), VOCA.class);
+            Intent pictogramActivity = new Intent(getActivity(), VOCAS.class);
             startActivity(pictogramActivity);
             startActivity(pictogramActivity);
         } else {
         } else {
             if (this.nameStudents[i].equals(getString(R.string.addStudent)))
             if (this.nameStudents[i].equals(getString(R.string.addStudent)))
@@ -222,7 +222,7 @@ public class StudentFragmentGrid extends Fragment {
                     if (progressDialog != null && progressDialog.isShowing())
                     if (progressDialog != null && progressDialog.isShowing())
                         progressDialog.dismiss();
                         progressDialog.dismiss();
                     PCBcontext.getPcbdb().user_valid(license_valid);
                     PCBcontext.getPcbdb().user_valid(license_valid);
-                    Intent pictogramActivity = new Intent(getActivity(), VOCA.class);
+                    Intent pictogramActivity = new Intent(getActivity(), VOCAS.class);
                     startActivity(pictogramActivity);
                     startActivity(pictogramActivity);
                 }
                 }
 
 

android/Pictogram/watch/src/main/java/com/yottacode/pictogram/watch/gui/MainActivity.java

@@ -46,6 +46,6 @@ public class MainActivity extends Activity {
   private void login() {
   private void login() {
     final String username="faf0002";
     final String username="faf0002";
     final String password="faf0002";
     final String password="faf0002";
-    new UserLogin().login(username,password,this, MainActivity.class,null);
+    new UserLogin().login(username,password,this, MainActivity.class);
   }
   }
 }
 }