Skip to content

yotta / pictogram

Go to a project
Commit 0038d400 by Fernando Martinez
Options

Merge branch 'fernando_branch' of http://scm.ujaen.es/softuno/pictogram into develop

parents 8403506d 23b27d26
Expand all
Inline Side-by-side
Showing with 112 additions and 12 deletions
android/Pictogram/build.gradle
...@@ -5,7 +5,7 @@ buildscript { ...@@ -5,7 +5,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.1.3' classpath 'com.android.tools.build:gradle:2.2.2'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
......
android/Pictogram/commonlibrary/build.gradle
...@@ -39,7 +39,6 @@ dependencies { ...@@ -39,7 +39,6 @@ dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
compile 'com.android.support:support-v4:21.1.1' compile 'com.android.support:support-v4:21.1.1'
compile 'com.android.support:support-v4:21.1.1'
compile 'com.android.support:appcompat-v7:21.0.+' compile 'com.android.support:appcompat-v7:21.0.+'
compile 'com.github.nkzawa:socket.io-client:0.5.0' compile 'com.github.nkzawa:socket.io-client:0.5.0'
compile 'com.koushikdutta.async:androidasync:2.+' compile 'com.koushikdutta.async:androidasync:2.+'
......
android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/dao/UserLogin.java
...@@ -2,9 +2,7 @@ package com.yottacode.pictogram.dao; ...@@ -2,9 +2,7 @@ package com.yottacode.pictogram.dao;
import android.app.Activity; import android.app.Activity;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences;
import android.util.Log; import android.util.Log;
import com.yottacode.net.RestapiWrapper; import com.yottacode.net.RestapiWrapper;
...@@ -20,7 +18,6 @@ import org.json.JSONArray; ...@@ -20,7 +18,6 @@ import org.json.JSONArray;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import java.util.StringTokenizer;
import java.util.Vector; import java.util.Vector;
/** /**
...@@ -41,7 +38,9 @@ public class UserLogin { ...@@ -41,7 +38,9 @@ public class UserLogin {
// String constant for logs // String constant for logs
private final String LOG_TAG = this.getClass().getSimpleName(); // Or .getCanonicalName() private final String LOG_TAG = this.getClass().getSimpleName(); // Or .getCanonicalName()
public static boolean isSupervisorLoginPattern(String user_name) {
return user_name.contains("@");
}
private void manageSupervisorLogin(final String email, final String password, boolean online, private void manageSupervisorLogin(final String email, final String password, boolean online,
final Activity activity, final Class PictogramActivity, final Class LoginActivity) { final Activity activity, final Class PictogramActivity, final Class LoginActivity) {
...@@ -257,7 +256,7 @@ public class UserLogin { ...@@ -257,7 +256,7 @@ public class UserLogin {
public void login(String username, String password, Activity activity, Class PictogramActivity, Class LoginActivity) { public void login(String username, String password, Activity activity, Class PictogramActivity, Class LoginActivity) {
boolean online= RestapiWrapper.ping(activity.getResources().getString(R.string.server), "server/ping"); boolean online= RestapiWrapper.ping(activity.getResources().getString(R.string.server), "server/ping");
if (username.contains("@")) if (isSupervisorLoginPattern(username))
manageSupervisorLogin(username,password,online, activity, PictogramActivity, LoginActivity); manageSupervisorLogin(username,password,online, activity, PictogramActivity, LoginActivity);
else else
manageStudentLogin(username,password,online, activity, PictogramActivity); manageStudentLogin(username,password,online, activity, PictogramActivity);
......
android/Pictogram/commonlibrary/src/main/res/values/strings.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name">Pictogram</string> <string name="app_name">Pictogram Tablet</string>
<string name="action_settings">Parámetros</string> <string name="action_settings">Parámetros</string>
<string name="title_activity_login">Entrada de usuarios</string> <string name="title_activity_login">Entrada de usuarios</string>
<string name="title_activity_login_activity_fragments">Entrada de usuarios</string> <string name="title_activity_login_activity_fragments">Entrada de usuarios</string>
...@@ -72,10 +72,8 @@ ...@@ -72,10 +72,8 @@
<string name="error_invalid_password">This password is too short</string> <string name="error_invalid_password">This password is too short</string>
<string name="error_incorrect_password">This password is incorrect</string> <string name="error_incorrect_password">This password is incorrect</string>
<string name="error_field_required">This field is required</string> <string name="error_field_required">This field is required</string>
<string name="permission_rationale">"Contacts permissions are needed for providing email <string name="permission_rationale">"Contacts permissions are needed for providing email completions."</string>
completions."
<!--online/offline status--> <!--online/offline status-->
<string name="pictogram_offline">Compruebe si tiene conexión a Internet. </string> <string name="pictogram_offline">Compruebe si tiene conexión a Internet. </string>
<string name="pictogram_online">Conexión con el servidor establecida. </string> <string name="pictogram_online">Conexión con el servidor establecida. </string>
</string>
</resources> </resources>
android/Pictogram/settings.gradle
include ':tablet', ':commonlibrary', ':watch' include ':supervisor_tablet', ':yotta_tablet', ':commonlibrary', ':watch', ':tabletlibrary'
android/Pictogram/supervisor_tablet/build.gradle 0 → 100644
apply plugin: 'com.android.application'
android {
/*signingConfigs {
config {
keyAlias 'Pictogram'
keyPassword 'danoia'
storeFile file('C:/Users/Fernando/pictogramkeys.jks')
storePassword 'danoia'
}
}*/
compileSdkVersion 24
buildToolsVersion "23.0.2"
defaultConfig {
applicationId "com.yottacode.supervisor_tablet"
minSdkVersion 21
targetSdkVersion 22
versionCode 1
versionName "1.0"
resValue "string","SerialClass","com.yottacode.pictogram.supervisor_tablet.gui.Supervisor_SerialActivity"
// signingConfig signingConfigs.config
}
productFlavors {
CIFlavor {
resValue "string", "server", "https://ci.yottacode.com"
resValue "bool", "ssl_connect", "false"
}
DevFlavor {
resValue "string", "server", "https://dev.yottacode.com"
resValue "bool", "ssl_connect", "false"
}
PreFlavor {
resValue "string", "server", "https://pre.yottacode.com"
resValue "bool", "ssl_connect", "true"
}
}
}
dependencies {
compile 'com.android.support:appcompat-v7:24.+'
compile 'com.android.support:support-v4:24.1.1'
compile fileTree(include: ['*.jar'], dir: 'libs')
compile project(':tabletlibrary')
}
android/Pictogram/supervisor_tablet/src/main/AndroidManifest.xml 0 → 100644
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.yottacode.pictogram.supervisor_tablet">
<!-- The app has the permission to receive the RECEIVE_BOOT_COMPLETED broadcast -->
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<!-- For kiosk mode -->
<uses-permission android:name="android.permission.WAKE_LOCK" />
<!-- For the service that restarts the app when another app go to foreground -->
<uses-permission android:name="android.permission.GET_TASKS" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<!-- To auto-complete the email text field in the login form with the user's emails -->
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.READ_PROFILE" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.READ_CALL_LOG" />
<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme">
<activity
android:name="com.yottacode.pictogram.tabletlibrary.gui.SplashScreenActivity"
android:label="@string/app_name"
android:screenOrientation="landscape">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name="com.yottacode.pictogram.tabletlibrary.gui.MainActivity"
android:label="@string/app_name"
android:screenOrientation="landscape" />
<activity
android:name=".gui.Supervisor_SerialActivity"
android:label="@string/title_activity_serial"
android:screenOrientation="landscape" />
<activity
android:name="com.yottacode.pictogram.tabletlibrary.gui.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:exported="true"
android:label="@string/app_name"
android:launchMode="singleTop"
android:screenOrientation="landscape" />
</application>
</manifest>
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