Marown/SWADroid
Marown/SWADroid
1
1
Fork 0
Code Issues 25 Pull Requests Packages Projects Releases 29 Wiki Activity

Merge branch 'release/0.4.4'

Browse Source
This commit is contained in:
Juan Miguel Boyero Corral 2011-07-05 13:30:10 +02:00
commit 92624795dc
8 changed files with 108 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
HISTORY.md
View File

@ -1,3 +1,9 @@
## 0.4.4 (2011-07-05)
* Added Write message function on main menu
* Updated ksoap2-android library
* Minor fixes
## 0.4.3 (2011-06-15)
* Minor fixes

2
SWADroid/AndroidManifest.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="es.ugr.swad.swadroid"
android:installLocation="auto" android:versionName="0.4.3" android:versionCode="20">
android:installLocation="auto" android:versionName="0.4.4" android:versionCode="21">
<application android:label="@string/app_name" android:icon="@drawable/ic_launcher_swadroid" android:debuggable="true">
<activity android:name=".SWADMain"
android:label="@string/app_name"

165
SWADroid/gen/es/ugr/swad/swadroid/R.java
View File

@ -137,93 +137,94 @@ public final class R {
public static final int menu_main=0x7f080000;
}
public static final class string {
public static final int about_preferences=0x7f070013;
public static final int acceptMsg=0x7f07003a;
public static final int allMsg=0x7f07003c;
public static final int about_preferences=0x7f070014;
public static final int acceptMsg=0x7f07003b;
public static final int allMsg=0x7f07003d;
public static final int app_name=0x7f070000;
public static final int assignment=0x7f07002f;
public static final int author_preferences=0x7f070015;
public static final int cancelMsg=0x7f07003b;
public static final int close_dialog=0x7f070006;
public static final int content=0x7f07002c;
public static final int assignment=0x7f070030;
public static final int author_preferences=0x7f070016;
public static final int cancelMsg=0x7f07003c;
public static final int close_dialog=0x7f070007;
public static final int content=0x7f07002d;
public static final int coursesModuleLabel=0x7f070003;
public static final int coursesProgressDescription=0x7f070020;
public static final int coursesProgressTitle=0x7f07001f;
public static final int dateMsg=0x7f070033;
public static final int errorBadLoginMsg=0x7f070053;
public static final int errorConnectionMsg=0x7f070055;
public static final int errorCopyMsg_DB=0x7f070023;
public static final int errorMsgLaunchingActivity=0x7f070021;
public static final int errorMsgNoConnection=0x7f070024;
public static final int errorMsgWorkaroundEmulator=0x7f070022;
public static final int errorServerResponseMsg=0x7f070054;
public static final int errorTimeoutMsg=0x7f070056;
public static final int evaluation=0x7f07002e;
public static final int examAnnouncement=0x7f070027;
public static final int falseMsg=0x7f070039;
public static final int firstRunMsg=0x7f070051;
public static final int forumReply=0x7f07002b;
public static final int fromMsg=0x7f070032;
public static final int initialDialogTitle=0x7f070050;
public static final int coursesProgressDescription=0x7f070021;
public static final int coursesProgressTitle=0x7f070020;
public static final int dateMsg=0x7f070034;
public static final int errorBadLoginMsg=0x7f070054;
public static final int errorConnectionMsg=0x7f070056;
public static final int errorCopyMsg_DB=0x7f070024;
public static final int errorMsgLaunchingActivity=0x7f070022;
public static final int errorMsgNoConnection=0x7f070025;
public static final int errorMsgWorkaroundEmulator=0x7f070023;
public static final int errorServerResponseMsg=0x7f070055;
public static final int errorTimeoutMsg=0x7f070057;
public static final int evaluation=0x7f07002f;
public static final int examAnnouncement=0x7f070028;
public static final int falseMsg=0x7f07003a;
public static final int firstRunMsg=0x7f070052;
public static final int forumReply=0x7f07002c;
public static final int fromMsg=0x7f070033;
public static final int initialDialogTitle=0x7f070051;
public static final int loginModuleLabel=0x7f070001;
public static final int loginProgressDescription=0x7f070019;
public static final int loginProgressTitle=0x7f070018;
public static final int loginSuccessfulMsg=0x7f070026;
public static final int loginTitle_menu=0x7f070017;
public static final int marksFile=0x7f070028;
public static final int message=0x7f07002a;
public static final int messages=0x7f07002d;
public static final int noContentMsg=0x7f070035;
public static final int noCourseSelectedMsg=0x7f07003e;
public static final int noMsg=0x7f070037;
public static final int noQuestionsAvailableTestsDownloadMsg=0x7f07003f;
public static final int noQuestionsPluggableTestsDownloadMsg=0x7f070040;
public static final int noSubjectMsg=0x7f070034;
public static final int notice=0x7f070029;
public static final int notificationsEmptyListMsg=0x7f07001c;
public static final int loginProgressDescription=0x7f07001a;
public static final int loginProgressTitle=0x7f070019;
public static final int loginSuccessfulMsg=0x7f070027;
public static final int loginTitle_menu=0x7f070018;
public static final int marksFile=0x7f070029;
public static final int message=0x7f07002b;
public static final int messageModuleLabel=0x7f070005;
public static final int messages=0x7f07002e;
public static final int noContentMsg=0x7f070036;
public static final int noCourseSelectedMsg=0x7f07003f;
public static final int noMsg=0x7f070038;
public static final int noQuestionsAvailableTestsDownloadMsg=0x7f070040;
public static final int noQuestionsPluggableTestsDownloadMsg=0x7f070041;
public static final int noSubjectMsg=0x7f070035;
public static final int notice=0x7f07002a;
public static final int notificationsEmptyListMsg=0x7f07001d;
public static final int notificationsModuleLabel=0x7f070002;
public static final int notificationsProgressDescription=0x7f07001b;
public static final int notificationsProgressTitle=0x7f07001a;
public static final int organization_preferences=0x7f070016;
public static final int preferencesTitle_menu=0x7f070012;
public static final int questionsTestsDownloadSuccesfulMsg=0x7f070041;
public static final int saveMsg_preferences=0x7f07000f;
public static final int saveSummary_preferences=0x7f070010;
public static final int saveTitle_preferences=0x7f070011;
public static final int selectCourseTitle=0x7f07003d;
public static final int set_preferences=0x7f070007;
public static final int survey=0x7f070030;
public static final int testAnswerTypesMsg=0x7f070048;
public static final int testEvaluateMsg=0x7f07004a;
public static final int testNoAnswerTypesSelectedMsg=0x7f070049;
public static final int testNoDetailsMsg=0x7f07004e;
public static final int testNoQuestionsCourseMsg=0x7f070042;
public static final int testNoQuestionsMeetsSpecifiedCriteriaMsg=0x7f070044;
public static final int testNoQuestionsMsg=0x7f070043;
public static final int testNoResultsMsg=0x7f07004f;
public static final int testNoTagsSelectedMsg=0x7f070047;
public static final int testNumQuestionsMsg=0x7f070045;
public static final int testResultsTextMsg=0x7f07004b;
public static final int testShowResultsDetailsMsg=0x7f07004d;
public static final int testShowResultsMsg=0x7f07004c;
public static final int testTagsMsg=0x7f070046;
public static final int testsDownloadProgressDescription=0x7f07001e;
public static final int testsDownloadProgressTitle=0x7f07001d;
public static final int notificationsProgressDescription=0x7f07001c;
public static final int notificationsProgressTitle=0x7f07001b;
public static final int organization_preferences=0x7f070017;
public static final int preferencesTitle_menu=0x7f070013;
public static final int questionsTestsDownloadSuccesfulMsg=0x7f070042;
public static final int saveMsg_preferences=0x7f070010;
public static final int saveSummary_preferences=0x7f070011;
public static final int saveTitle_preferences=0x7f070012;
public static final int selectCourseTitle=0x7f07003e;
public static final int set_preferences=0x7f070008;
public static final int survey=0x7f070031;
public static final int testAnswerTypesMsg=0x7f070049;
public static final int testEvaluateMsg=0x7f07004b;
public static final int testNoAnswerTypesSelectedMsg=0x7f07004a;
public static final int testNoDetailsMsg=0x7f07004f;
public static final int testNoQuestionsCourseMsg=0x7f070043;
public static final int testNoQuestionsMeetsSpecifiedCriteriaMsg=0x7f070045;
public static final int testNoQuestionsMsg=0x7f070044;
public static final int testNoResultsMsg=0x7f070050;
public static final int testNoTagsSelectedMsg=0x7f070048;
public static final int testNumQuestionsMsg=0x7f070046;
public static final int testResultsTextMsg=0x7f07004c;
public static final int testShowResultsDetailsMsg=0x7f07004e;
public static final int testShowResultsMsg=0x7f07004d;
public static final int testTagsMsg=0x7f070047;
public static final int testsDownloadProgressDescription=0x7f07001f;
public static final int testsDownloadProgressTitle=0x7f07001e;
public static final int testsModuleLabel=0x7f070004;
public static final int title_error_dialog=0x7f070005;
public static final int trueMsg=0x7f070038;
public static final int unknownNotification=0x7f070031;
public static final int upgradeMsg=0x7f070052;
public static final int upgradeMsg_DB=0x7f070025;
public static final int userIDName_preferences=0x7f070009;
public static final int userIDSummary_preferences=0x7f07000a;
public static final int userIDTitle_preferences=0x7f07000b;
public static final int userPasswordName_preferences=0x7f07000c;
public static final int userPasswordSummary_preferences=0x7f07000d;
public static final int userPasswordTitle_preferences=0x7f07000e;
public static final int user_preferences=0x7f070008;
public static final int versionTitle_preferences=0x7f070014;
public static final int yesMsg=0x7f070036;
public static final int title_error_dialog=0x7f070006;
public static final int trueMsg=0x7f070039;
public static final int unknownNotification=0x7f070032;
public static final int upgradeMsg=0x7f070053;
public static final int upgradeMsg_DB=0x7f070026;
public static final int userIDName_preferences=0x7f07000a;
public static final int userIDSummary_preferences=0x7f07000b;
public static final int userIDTitle_preferences=0x7f07000c;
public static final int userPasswordName_preferences=0x7f07000d;
public static final int userPasswordSummary_preferences=0x7f07000e;
public static final int userPasswordTitle_preferences=0x7f07000f;
public static final int user_preferences=0x7f070009;
public static final int versionTitle_preferences=0x7f070015;
public static final int yesMsg=0x7f070037;
}
public static final class xml {
public static final int preferences=0x7f040000;

BIN
SWADroid/libs/ksoap2-android-assembly-2.5.5-jar-with-dependencies.jar → SWADroid/libs/ksoap2-android-assembly-2.5.6-jar-with-dependencies.jar
View File

Binary file not shown.

1
SWADroid/res/values-es/strings.xml
View File

@ -5,6 +5,7 @@
<string name="notificationsModuleLabel">Notificaciones</string>
<string name="coursesModuleLabel">Asignaturas</string>
<string name="testsModuleLabel">Tests</string>
<string name="messageModuleLabel">Enviar mensaje</string>
<string name="title_error_dialog">ERROR</string>
<string name="close_dialog">Cerrar</string>
<string name="set_preferences">Configuración</string>

1
SWADroid/res/values/strings.xml
View File

@ -5,6 +5,7 @@
<string name="notificationsModuleLabel">Notifications</string>
<string name="coursesModuleLabel">Courses</string>
<string name="testsModuleLabel">Tests</string>
<string name="messageModuleLabel">Send message</string>
<string name="title_error_dialog">ERROR</string>
<string name="close_dialog">Close</string>
<string name="set_preferences">Preferences</string>

11
SWADroid/src/es/ugr/swad/swadroid/SWADMain.java
View File

@ -38,6 +38,7 @@ import android.view.View;
import android.widget.ExpandableListView;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
import es.ugr.swad.swadroid.model.DataBaseHelper;
import es.ugr.swad.swadroid.modules.notifications.Notifications;
import es.ugr.swad.swadroid.modules.tests.Tests;
@ -172,10 +173,11 @@ public class SWADMain extends ExpandableListActivity {
{
activity = new Intent(getBaseContext(), Notifications.class);
startActivityForResult(activity, Global.NOTIFICATIONS_REQUEST_CODE);
} else if(keyword.equals(getString(R.string.testsModuleLabel))) {
activity = new Intent(getBaseContext(), Tests.class);
startActivityForResult(activity, Global.TESTS_REQUEST_CODE);
} else if(keyword.equals(getString(R.string.messageModuleLabel))) {
Toast.makeText(this, "Opción en desarrollo", Toast.LENGTH_SHORT).show();
}
return true;
@ -216,11 +218,18 @@ public class SWADMain extends ExpandableListActivity {
final ArrayList<HashMap<String, Object>> evaluationData = new ArrayList<HashMap<String, Object>>();
childData.add(evaluationData);
//Messages category
HashMap<String, Object> map = new HashMap<String,Object>();
map.put(NAME, getString(R.string.notificationsModuleLabel) );
map.put(IMAGE, getResources().getDrawable(R.drawable.notif));
messagesData.add(map);
map = new HashMap<String,Object>();
map.put(NAME, getString(R.string.messageModuleLabel) );
map.put(IMAGE, getResources().getDrawable(R.drawable.msg));
messagesData.add(map);
//Evaluation category
map = new HashMap<String,Object>();
map.put(NAME, getString(R.string.testsModuleLabel) );
map.put(IMAGE, getResources().getDrawable(R.drawable.test));

1
SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsMake.java
View File

@ -732,6 +732,7 @@ public class TestsMake extends Module {
coursesDialog.show();
} else {
Toast.makeText(getBaseContext(), R.string.testNoQuestionsMsg, Toast.LENGTH_LONG).show();
finish();
}
}