Refactorización a Pictogram Communicator y Pictogram Supervisor

parent 00b760f4
Showing with 27 additions and 24 deletions
......@@ -52,10 +52,10 @@ src/main/assets/core_vocabulary/57236.png
src/main/assets/core_vocabulary/57384.png
src/main/createdoc.bat
src/main/resources/
yotta_tablet/yotta_tablet.iml
commonlibrary/commonlibrary.iml
supervisor_tablet/supervisor_tablet.iml
communicator/yotta_tablet.iml
commonlibrary/commonlibrary.iml
supervisor/supervisor_tablet.iml
watch/watch.iml
app
......@@ -65,19 +65,23 @@ gen/
/Pictogram.iml
/.gitignore
!/tabletlibrary/tabletlibrary.iml
supervisor_tablet/src/main/res/drawable-xhdpi/
supervisor_tablet/src/main/res/drawable-xxhdpi/
supervisor_tablet/src/main/res/drawable-xxxhdpi/
supervisor/src/main/res/drawable-xhdpi/
supervisor/src/main/res/drawable-xxhdpi/
supervisor/src/main/res/drawable-xxxhdpi/
tabletlibrary/libs/
tabletlibrary/src/main/res/anim/slide_in.xml
tabletlibrary/src/main/res/anim/slide_out.xml
tabletlibrary/src/main/res/drawable-hdpi/descarga.png
tabletlibrary/src/main/res/drawable-hdpi/flash.png
tabletlibrary/src/main/res/drawable-hdpi/session_talk.png
yotta_tablet/src/main/res/drawable-hdpi/
yotta_tablet/src/main/res/drawable-xhdpi/
yotta_tablet/src/main/res/drawable-xxhdpi/
yotta_tablet/src/main/res/drawable-xxxhdpi/
communicator/src/main/res/drawable-hdpi/
communicator/src/main/res/drawable-xhdpi/
communicator/src/main/res/drawable-xxhdpi/
communicator/src/main/res/drawable-xxxhdpi/
/watch/watch.iml
/commonlibrary/commonlibrary.iml
/tabletlibrary/tabletlibrary.iml
communicator/.gitignore
communicator/build.gradle
communicator/communicator.iml
communicator/proguard-rules.pro
apply plugin: 'com.android.library'
android {
compileSdkVersion 21
compileSdkVersion 24
buildToolsVersion '25.0.0'
defaultConfig {
......@@ -41,8 +41,8 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
compile 'com.android.support:support-v4:21.1.1'
compile 'com.android.support:appcompat-v7:21.0.+'
compile 'com.android.support:support-v4:24.2.1'
compile 'com.android.support:appcompat-v7:24.2.1'
compile 'com.github.nkzawa:socket.io-client:0.5.0'
compile 'com.koushikdutta.async:androidasync:2.+'
compile 'com.koushikdutta.ion:ion:2.+'
......
......@@ -85,7 +85,7 @@
<string name="fa_exclamation_triangle">&#xf071;</string>
<string name="fa_user_plus">&#xf234;</string>
<string name="fa_question_circle">&#xf059;</string>
<string name="google_play_student_apk">https://play.google.com/store/apps/details?id=com.yottacode.yotta_tablet</string>
<string name="google_play_supervisor_apk">https://play.google.com/store/apps/details?id=com.yottacode.supervisor_tablet</string>
<string name="google_play_student_apk">https://play.google.com/store/apps/details?id=com.yottacode.communicator</string>
<string name="google_play_supervisor_apk">https://play.google.com/store/apps/details?id=com.yottacode.supervisor</string>
</resources>
......@@ -80,7 +80,7 @@
<string name="fa_exclamation_triangle">&#xf071;</string>
<string name="fa_question_circle">&#xf059;</string>
<string name="fa_user_plus">&#xf234;</string>
<string name="google_play_student_apk">https://play.google.com/store/apps/details?id=com.yottacode.yotta_tablet</string>
<string name="google_play_supervisor_apk">https://play.google.com/store/apps/details?id=com.yottacode.supervisor_tablet</string>
<string name="google_play_student_apk">https://play.google.com/store/apps/details?id=com.yottacode.communicator</string>
<string name="google_play_supervisor_apk">https://play.google.com/store/apps/details?id=com.yottacode.supervisor</string>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Pictogram Tablet</string>
<string name="action_settings">Parámetros</string>
<string name="title_activity_login">Entrada de usuarios</string>
<string name="title_activity_login_activity_fragments">Entrada de usuarios</string>
......@@ -85,6 +84,6 @@
<string name="fa_exclamation_triangle">&#xf071;</string>
<string name="fa_user_plus">&#xf234;</string>
<string name="fa_question_circle">&#xf059;</string>
<string name="google_play_student_apk">https://play.google.com/store/apps/details?id=com.yottacode.yotta_tablet</string>
<string name="google_play_supervisor_apk">https://play.google.com/store/apps/details?id=com.yottacode.supervisor_tablet</string>
<string name="google_play_student_apk">https://play.google.com/store/apps/details?id=com.yottacode.communicator</string>
<string name="google_play_supervisor_apk">https://play.google.com/store/apps/details?id=com.yottacode.supervisor</string>
</resources>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.yottacode.pictogram.yotta_tablet">
package="com.yottacode.pictogram.communicator">
<!-- The app has the permission to receive the RECEIVE_BOOT_COMPLETED broadcast -->
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
......@@ -21,7 +21,7 @@
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<uses-permission android:name="android.permission.READ_CALL_LOG" />
<application
android:name=".kiosk.AppContext"
android:name="com.yottacode.pictogram.communicator.kiosk.AppContext"
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
......@@ -62,14 +62,14 @@
android:launchMode="singleTop"
android:screenOrientation="landscape" />
<!-- Intent Filter to run the app when the boot is completed -->
<receiver android:name=".kiosk.BootReceiver">
<receiver android:name="com.yottacode.pictogram.communicator.kiosk.BootReceiver">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
</receiver>
<!-- Service for restarting the app when another app go to foreground -->
<service
android:name=".kiosk.KioskService"
android:name="com.yottacode.pictogram.communicator.kiosk.KioskService"
android:exported="false" />
<activity
......
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