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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
Conflicts:
	SWADroid/gen/es/ugr/swad/swadroid/R.java
This commit is contained in:
Helena Rodriguez 2012-04-07 11:21:41 +02:00
commit f9d91caadd
19 changed files with 248 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -7,3 +7,9 @@ capturas/
iconos/
gitstats/
SWADroidTest/
.DS_Store
SWADroid/.DS_Store
SWADroid/gen/es/ugr/swad/swadroid/BuildConfig.java
SWADroid/gen/es/ugr/swad/swadroid/R.java

6
SWADroid/gen/es/ugr/swad/swadroid/BuildConfig.java Normal file
View File

@ -0,0 +1,6 @@
/** Automatically generated file. DO NOT MODIFY */
package es.ugr.swad.swadroid;
public final class BuildConfig {
public final static boolean DEBUG = true;
}

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

@ -44,92 +44,95 @@ public final class R {
public static final int note=0x7f02000e;
public static final int notif=0x7f02000f;
public static final int recmsg=0x7f020010;
public static final int survey=0x7f020011;
public static final int test=0x7f020012;
public static final int timepicker_down_btn=0x7f020013;
public static final int timepicker_down_disabled=0x7f020014;
public static final int timepicker_down_disabled_focused=0x7f020015;
public static final int timepicker_down_normal=0x7f020016;
public static final int timepicker_down_pressed=0x7f020017;
public static final int timepicker_down_selected=0x7f020018;
public static final int timepicker_input=0x7f020019;
public static final int timepicker_input_disabled=0x7f02001a;
public static final int timepicker_input_normal=0x7f02001b;
public static final int timepicker_input_pressed=0x7f02001c;
public static final int timepicker_input_selected=0x7f02001d;
public static final int timepicker_up_btn=0x7f02001e;
public static final int timepicker_up_disabled=0x7f02001f;
public static final int timepicker_up_disabled_focused=0x7f020020;
public static final int timepicker_up_normal=0x7f020021;
public static final int timepicker_up_pressed=0x7f020022;
public static final int timepicker_up_selected=0x7f020023;
public static final int title_button=0x7f020024;
public static final int title_refresh=0x7f020025;
public static final int rotate_refresh=0x7f020011;
public static final int survey=0x7f020012;
public static final int test=0x7f020013;
public static final int timepicker_down_btn=0x7f020014;
public static final int timepicker_down_disabled=0x7f020015;
public static final int timepicker_down_disabled_focused=0x7f020016;
public static final int timepicker_down_normal=0x7f020017;
public static final int timepicker_down_pressed=0x7f020018;
public static final int timepicker_down_selected=0x7f020019;
public static final int timepicker_input=0x7f02001a;
public static final int timepicker_input_disabled=0x7f02001b;
public static final int timepicker_input_normal=0x7f02001c;
public static final int timepicker_input_pressed=0x7f02001d;
public static final int timepicker_input_selected=0x7f02001e;
public static final int timepicker_up_btn=0x7f02001f;
public static final int timepicker_up_disabled=0x7f020020;
public static final int timepicker_up_disabled_focused=0x7f020021;
public static final int timepicker_up_normal=0x7f020022;
public static final int timepicker_up_pressed=0x7f020023;
public static final int timepicker_up_selected=0x7f020024;
public static final int title_button=0x7f020025;
public static final int title_refresh=0x7f020026;
}
public static final class id {
public static final int actionBarLayout=0x7f090000;
public static final int clean_database_menu=0x7f090040;
public static final int contentWebView=0x7f090025;
public static final int courseNameText=0x7f090023;
public static final int decrement=0x7f090021;
public static final int eventContent=0x7f09001a;
public static final int eventDate=0x7f090016;
public static final int eventLocation=0x7f09001c;
public static final int eventMetaData=0x7f090014;
public static final int eventSender=0x7f090018;
public static final int eventSummary=0x7f09001d;
public static final int eventText=0x7f09001e;
public static final int eventTime=0x7f090017;
public static final int eventType=0x7f09001b;
public static final int increment=0x7f09001f;
public static final int listIcon=0x7f090009;
public static final int listItems=0x7f09000b;
public static final int listText=0x7f09000a;
public static final int messageReplyButton=0x7f090019;
public static final int message_body_text=0x7f09000e;
public static final int message_button_accept=0x7f09000f;
public static final int message_button_cancel=0x7f090010;
public static final int message_receivers_text=0x7f09000c;
public static final int message_subject_text=0x7f09000d;
public static final int clean_database_menu=0x7f090042;
public static final int contentWebView=0x7f090027;
public static final int courseNameText=0x7f090025;
public static final int decrement=0x7f090023;
public static final int eventContent=0x7f09001b;
public static final int eventDate=0x7f090017;
public static final int eventLocation=0x7f09001d;
public static final int eventMetaData=0x7f090015;
public static final int eventMsg=0x7f090020;
public static final int eventSender=0x7f090019;
public static final int eventSummary=0x7f09001e;
public static final int eventText=0x7f09001f;
public static final int eventTime=0x7f090018;
public static final int eventType=0x7f09001c;
public static final int increment=0x7f090021;
public static final int listIcon=0x7f09000a;
public static final int listItems=0x7f09000c;
public static final int listText=0x7f09000b;
public static final int messageReplyButton=0x7f09001a;
public static final int message_body_text=0x7f09000f;
public static final int message_button_accept=0x7f090010;
public static final int message_button_cancel=0x7f090011;
public static final int message_receivers_text=0x7f09000d;
public static final int message_subject_text=0x7f09000e;
public static final int moduleIcon=0x7f090001;
public static final int moduleName=0x7f090002;
public static final int notice_body_text=0x7f090011;
public static final int notice_button_accept=0x7f090012;
public static final int notice_button_cancel=0x7f090013;
public static final int notificationIcon=0x7f090015;
public static final int preferences_menu=0x7f090041;
public static final int rate_menu=0x7f09003f;
public static final int notice_body_text=0x7f090012;
public static final int notice_button_accept=0x7f090013;
public static final int notice_button_cancel=0x7f090014;
public static final int notificationIcon=0x7f090016;
public static final int preferences_menu=0x7f090043;
public static final int progress_refresh=0x7f090009;
public static final int rate_menu=0x7f090041;
public static final int refresh=0x7f090008;
public static final int senderNameText=0x7f090022;
public static final int share_menu=0x7f09003e;
public static final int summaryText=0x7f090024;
public static final int testAnswerTypesAcceptButton=0x7f090028;
public static final int testAnswerTypesList=0x7f090027;
public static final int testAnswerTypesText=0x7f090026;
public static final int senderNameText=0x7f090024;
public static final int share_menu=0x7f090040;
public static final int summaryText=0x7f090026;
public static final int testAnswerTypesAcceptButton=0x7f09002a;
public static final int testAnswerTypesList=0x7f090029;
public static final int testAnswerTypesText=0x7f090028;
public static final int testEvaluateButton=0x7f090006;
public static final int testMakeAnswer=0x7f09002c;
public static final int testMakeBottomBar=0x7f090031;
public static final int testMakeCorrectAnswer=0x7f09002f;
public static final int testMakeCorrectAnswerImage=0x7f09002d;
public static final int testMakeEditText=0x7f09002e;
public static final int testMakeList=0x7f090030;
public static final int testMakeNextButton=0x7f090034;
public static final int testMakePrevButton=0x7f090032;
public static final int testMakeQuestionScore=0x7f09002a;
public static final int testMakeStem=0x7f090029;
public static final int testMakeText=0x7f09002b;
public static final int testNumQuestionsAcceptButton=0x7f09003a;
public static final int testNumQuestionsNumberPicker=0x7f090037;
public static final int testNumQuestionsText=0x7f090039;
public static final int testResultsButton=0x7f090038;
public static final int testResultsScore=0x7f090036;
public static final int testResultsText=0x7f090035;
public static final int testMakeAnswer=0x7f09002e;
public static final int testMakeBottomBar=0x7f090033;
public static final int testMakeCorrectAnswer=0x7f090031;
public static final int testMakeCorrectAnswerImage=0x7f09002f;
public static final int testMakeEditText=0x7f090030;
public static final int testMakeList=0x7f090032;
public static final int testMakeNextButton=0x7f090036;
public static final int testMakePrevButton=0x7f090034;
public static final int testMakeQuestionScore=0x7f09002c;
public static final int testMakeStem=0x7f09002b;
public static final int testMakeText=0x7f09002d;
public static final int testNumQuestionsAcceptButton=0x7f09003c;
public static final int testNumQuestionsNumberPicker=0x7f090039;
public static final int testNumQuestionsText=0x7f09003b;
public static final int testResultsButton=0x7f09003a;
public static final int testResultsScore=0x7f090038;
public static final int testResultsText=0x7f090037;
public static final int testShowResultsButton=0x7f090004;
public static final int testTagsAcceptButton=0x7f09003d;
public static final int testTagsList=0x7f09003c;
public static final int testTagsText=0x7f09003b;
public static final int test_questions_bar=0x7f090033;
public static final int timepicker_input=0x7f090020;
public static final int testTagsAcceptButton=0x7f09003f;
public static final int testTagsList=0x7f09003e;
public static final int testTagsText=0x7f09003d;
public static final int test_questions_bar=0x7f090035;
public static final int timepicker_input=0x7f090022;
public static final int title_sep_1=0x7f090007;
public static final int title_sep_2=0x7f090005;
public static final int title_sep_3=0x7f090003;
@ -206,6 +209,7 @@ public final class R {
public static final int marketURL=0x7f07006a;
public static final int marketWebURL=0x7f07006b;
public static final int marksFile=0x7f07002e;
public static final int marksMsg=0x7f07007b;
public static final int message=0x7f070030;
public static final int messageSendErrorMsg=0x7f07005f;
public static final int messageSendedMsg=0x7f07005e;

5
SWADroid/res/drawable/rotate_refresh.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<animated-rotate xmlns:android="http://schemas.android.com/apk/res/android"
android:drawable="@drawable/title_refresh"
android:pivotX="50%"
android:pivotY="50%" />

15
SWADroid/res/layout/action_bar.xml
View File

@ -101,6 +101,7 @@
<ImageButton
android:id="@+id/refresh"
android:layout_toLeftOf="@+id/progress_refresh"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignWithParentIfMissing="true"
@ -110,5 +111,19 @@
android:src="@drawable/title_refresh"
android:onClick="onRefreshClick"
android:background="@drawable/title_button"
android:scaleType="centerCrop"
android:paddingLeft="3dp"
android:paddingRight="5dp"
android:visibility="gone"/>
<ProgressBar
android:id="@+id/progress_refresh"
android:indeterminateDrawable="@drawable/rotate_refresh"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignWithParentIfMissing="true"
android:layout_alignParentTop="true"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:visibility="gone"/>
</RelativeLayout>

10
SWADroid/res/layout/notifications_list_item.xml
View File

@ -98,5 +98,15 @@
android:padding="1dip"
android:autoLink="web"
android:visibility="gone" />
<TextView
android:id="@+id/eventMsg"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:textColor="@color/foreground1"
android:textSize="16sp"
android:padding="1dip"
android:autoLink="web"
android:visibility="gone" />
</LinearLayout>
</LinearLayout>

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

@ -124,4 +124,5 @@
<string name="notificationsAlertTitle">Nuevas notificaciones</string>
<string name="notificationsAlertMsg">nuevas notificaciones</string>
<string name="footMessageMsg">Enviado desde</string>
<string name="marksMsg">Pulse sobre la notificación para ver la calificación.</string>
</resources>

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

@ -118,16 +118,17 @@
the e-learning platform SWAD.\nGet it for free here:
https://market.android.com/details?id=es.ugr.swad.swadroid</string>
<string name="marketURL">market://details?id=es.ugr.swad.swadroid</string>
<string name="marketWebURL">https://play.google.com/store/apps/details?id=es.ugr.swad.swadroid</string><string name="twitterURL">https://twitter.com/#!/SWADroid</string>
<string name="marketWebURL">http://goo.gl/Wgo1y</string><string name="twitterURL">https://twitter.com/#!/SWADroid</string>
<string name="facebookURL">https://www.facebook.com/SWADroid</string>
<string name="googlePlusURL">https://plus.google.com/115615684349730524355/posts</string>
<string name="mailingListURL">https://groups.google.com/forum/#!forum/swadroid</string>
<string name="googlePlusURL">http://goo.gl/kuezQ</string>
<string name="mailingListURL">http://goo.gl/3A5iO</string>
<string name="blogURL">http://swadroid.wordpress.com</string>
<string name="twitterUser">\@SWADroid</string><string name="twitterTitle">Twitter</string>
<string name="facebookTitle">Facebook</string>
<string name="googlePlusTitle">Google+</string>
<string name="mailingListTitle">Mailing list</string>
<string name="blogTitle">Blog</string><string name="marketTitle">Android Market</string><string name="notificationsAlertTitle">New notifications</string><string name="notificationsAlertMsg">new notifications</string><string name="footMessageMsg">Sended from</string>
<string name="marksMsg">Click on the notification to view the mark.</string>

8
SWADroid/src/es/ugr/swad/swadroid/modules/Courses.java
View File

@ -172,4 +172,12 @@ public class Courses extends Module {
protected void postConnect() {
finish();
}
/* (non-Javadoc)
* @see es.ugr.swad.swadroid.modules.Module#onError()
*/
@Override
protected void onError() {
}
}

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

@ -153,8 +153,19 @@ public class Login extends Module {
setResult(RESULT_OK);
}
/* (non-Javadoc)
* @see es.ugr.swad.swadroid.modules.Module#postConnect()
*/
@Override
protected void postConnect() {
finish();
}
/* (non-Javadoc)
* @see es.ugr.swad.swadroid.modules.Module#onError()
*/
@Override
protected void onError() {
}
}

9
SWADroid/src/es/ugr/swad/swadroid/modules/Messages.java
View File

@ -233,5 +233,12 @@ public class Messages extends Module {
finish();
}
/* (non-Javadoc)
* @see es.ugr.swad.swadroid.modules.Module#onError()
*/
@Override
protected void onError() {
}
}

9
SWADroid/src/es/ugr/swad/swadroid/modules/Module.java
View File

@ -126,6 +126,11 @@ public abstract class Module extends MenuActivity {
*/
protected abstract void postConnect();
/**
* Error handler
*/
protected abstract void onError();
/**
* Gets METHOD_NAME parameter.
* @return METHOD_NAME parameter.
@ -573,7 +578,8 @@ public abstract class Module extends MenuActivity {
errorMsg = e.getMessage();
}
//Request finalized with errors
//Request finalized with errors
onError();
error(errorMsg);
/*if(isDebuggable) {
e.printStackTrace();
@ -581,7 +587,6 @@ public abstract class Module extends MenuActivity {
Log.d(TAG, connection.requestDump.toString());
Log.d(TAG, connection.responseDump.toString());
}*/
setResult(RESULT_CANCELED);
} else {
postConnect();

5
SWADroid/src/es/ugr/swad/swadroid/modules/Notices.java
View File

@ -292,6 +292,11 @@ public class Notices extends Module {
finish();
}
}
@Override
protected void onError() {
// TODO Auto-generated method stub
}

32
SWADroid/src/es/ugr/swad/swadroid/modules/notifications/Notifications.java
View File

@ -48,6 +48,7 @@ import android.widget.AdapterView.OnItemClickListener;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.ProgressBar;
import android.widget.TextView;
/**
@ -136,6 +137,7 @@ public class Notifications extends Module {
};
super.onCreate(savedInstanceState);
setContentView(R.layout.list_items);
image = (ImageView)this.findViewById(R.id.moduleIcon);
@ -178,7 +180,15 @@ public class Notifications extends Module {
*/
public void onRefreshClick(View v)
{
ImageButton updateButton = (ImageButton)this.findViewById(R.id.refresh);
ProgressBar pb = (ProgressBar)this.findViewById(R.id.progress_refresh);
updateButton.setVisibility(View.GONE);
pb.setVisibility(View.VISIBLE);
runConnection();
if(!isConnected)
onError();
}
/* (non-Javadoc)
@ -291,8 +301,8 @@ public class Notifications extends Module {
protected void connect() {
String progressDescription = getString(R.string.notificationsProgressDescription);
int progressTitle = R.string.notificationsProgressTitle;
new Connect(true, progressDescription, progressTitle).execute();
new Connect(false, progressDescription, progressTitle).execute();
}
/* (non-Javadoc)
@ -304,6 +314,24 @@ public class Notifications extends Module {
//Toast.makeText(this, R.string.notificationsDownloadedMsg, Toast.LENGTH_SHORT).show();
alertNotif();
ProgressBar pb = (ProgressBar)this.findViewById(R.id.progress_refresh);
ImageButton updateButton = (ImageButton)this.findViewById(R.id.refresh);
pb.setVisibility(View.GONE);
updateButton.setVisibility(View.VISIBLE);
}
/* (non-Javadoc)
* @see es.ugr.swad.swadroid.modules.Module#onError()
*/
@Override
protected void onError() {
ProgressBar pb = (ProgressBar)this.findViewById(R.id.progress_refresh);
ImageButton updateButton = (ImageButton)this.findViewById(R.id.refresh);
pb.setVisibility(View.GONE);
updateButton.setVisibility(View.VISIBLE);
}
/**

28
SWADroid/src/es/ugr/swad/swadroid/modules/notifications/NotificationsCursorAdapter.java
View File

@ -49,7 +49,7 @@ public class NotificationsCursorAdapter extends CursorAdapter {
* @param c Database cursor
*/
public NotificationsCursorAdapter(Context context, Cursor c) {
super(context, c);
super(context, c, true);
ctx = context;
int numRows = c.getCount();
@ -77,8 +77,9 @@ public class NotificationsCursorAdapter extends CursorAdapter {
final Context ctx = context;
final Long notificationCode = cursor.getLong(cursor.getColumnIndex("id"));
long unixTime;
String type, sender, senderFirstname, senderSurname1, senderSurname2, summaryText;
String contentText;
String type = "";
String sender, senderFirstname, senderSurname1, senderSurname2, summaryText;
String contentText, contentMsgText;
String[] dateContent;
Date d;
int numRows = cursor.getCount();
@ -95,6 +96,7 @@ public class NotificationsCursorAdapter extends CursorAdapter {
TextView location = (TextView) view.findViewById(R.id.eventLocation);
final TextView summary = (TextView) view.findViewById(R.id.eventSummary);
TextView content = (TextView) view.findViewById(R.id.eventText);
TextView contentMsg = (TextView) view.findViewById(R.id.eventMsg);
ImageView notificationIcon = (ImageView) view.findViewById(R.id.notificationIcon);
ImageView messageReplyButton = (ImageView) view.findViewById(R.id.messageReplyButton);
@ -172,7 +174,7 @@ public class NotificationsCursorAdapter extends CursorAdapter {
eventSender.setText(sender);
}
if(location != null) {
location.setText(cursor.getString(cursor.getColumnIndex("location")));
location.setText(Html.fromHtml(cursor.getString(cursor.getColumnIndex("location"))));
}
if(summary != null){
summaryText = cursor.getString(cursor.getColumnIndex("summary"));
@ -189,13 +191,23 @@ public class NotificationsCursorAdapter extends CursorAdapter {
//Empty field checking
if(contentText.equals("anyType{}"))
contentText = context.getString(R.string.noContentMsg);
content.setText(contentText);
content.setText(contentText);
if(type.equals(context.getString(R.string.marksFile))) {
contentMsgText = context.getString(R.string.marksMsg);
contentMsg.setText(contentMsgText);
contentVisible[cursor.getPosition()] = true;
} else {
contentMsgText = "";
contentMsg.setText(contentMsgText);
contentVisible[cursor.getPosition()] = false;
}
if(contentVisible[cursor.getPosition()]) {
content.setVisibility(View.VISIBLE);
contentMsg.setVisibility(View.VISIBLE);
} else {
content.setVisibility(View.GONE);
contentMsg.setVisibility(View.GONE);
}
}
}

7
SWADroid/src/es/ugr/swad/swadroid/modules/tests/Tests.java
View File

@ -117,5 +117,12 @@ public class Tests extends Module {
protected void postConnect() {
}
/* (non-Javadoc)
* @see es.ugr.swad.swadroid.modules.Module#onError()
*/
@Override
protected void onError() {
}
}

8
SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsConfigDownload.java
View File

@ -266,4 +266,12 @@ public class TestsConfigDownload extends Module {
finish();
}
/* (non-Javadoc)
* @see es.ugr.swad.swadroid.modules.Module#onError()
*/
@Override
protected void onError() {
}
}

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

@ -761,5 +761,12 @@ public class TestsMake extends Module {
protected void postConnect() {
}
/* (non-Javadoc)
* @see es.ugr.swad.swadroid.modules.Module#onError()
*/
@Override
protected void onError() {
}
}

8
SWADroid/src/es/ugr/swad/swadroid/modules/tests/TestsQuestionsDownload.java
View File

@ -247,4 +247,12 @@ public class TestsQuestionsDownload extends Module {
Toast.makeText(this, R.string.questionsTestsDownloadSuccesfulMsg, Toast.LENGTH_LONG).show();
finish();
}
/* (non-Javadoc)
* @see es.ugr.swad.swadroid.modules.Module#onError()
*/
@Override
protected void onError() {
}
}