Deleted information classes for group in one class
This commit is contained in:
parent
66a0819505
commit
ef033e84c9
|
@ -326,8 +326,18 @@
|
|||
<string name="contents_location">Geographic coordinates</string>
|
||||
<string name="contents_phone">Phone number</string>
|
||||
<string name="contents_sms">SMS address</string>
|
||||
<string name="informationModuleLabel">Information</string>
|
||||
<string name="introductionModuleLabel">Introduction</string>
|
||||
|
||||
|
||||
<string name="informationModuleLabel">Information</string>
|
||||
<string name="introductionModuleLabel">Introduction</string>
|
||||
<string name="faqsModuleLabel">FAQs</string>
|
||||
<string name="linksModuleLabel">Links</string>
|
||||
<string name="bibliographyModuleLabel">Bibliography</string>
|
||||
<string name="practicesprogramModuleLabel">Practices Program</string>
|
||||
<string name="theoryprogramModuleLabel">Theory Program</string>
|
||||
<string name="teachingguideModuleLabel">Teaching Guide</string>
|
||||
|
||||
|
||||
<string name="introduction">Introduction</string>
|
||||
<string name="contents_text">Plain text</string>
|
||||
<string name="lastSyncTimeLabel">Last synchronization</string>
|
||||
|
|
|
@ -219,10 +219,50 @@ public class Constants {
|
|||
|
||||
|
||||
|
||||
/**
|
||||
* Request code for Information
|
||||
*/
|
||||
public static final int INFORMATION_REQUEST_CODE = 27;
|
||||
|
||||
/**
|
||||
* Request code for Introduction
|
||||
*/
|
||||
public static final int INTRODUCTION_REQUEST_CODE = 27;
|
||||
public static final int INTRODUCTION_REQUEST_CODE = 28;
|
||||
|
||||
/**
|
||||
* Request code for FAQs
|
||||
*/
|
||||
public static final int FAQS_REQUEST_CODE = 29;
|
||||
|
||||
/**
|
||||
* Request code for Bibliography
|
||||
*/
|
||||
public static final int BIBLIOGRAPHY_REQUEST_CODE = 30;
|
||||
|
||||
/**
|
||||
* Request code for Practices Program
|
||||
*/
|
||||
public static final int PRACTICESPROGRAM_REQUEST_CODE = 31;
|
||||
|
||||
/**
|
||||
* Request code for Theory Program
|
||||
*/
|
||||
public static final int THEORYPROGRAM_REQUEST_CODE = 32;
|
||||
|
||||
/**
|
||||
* Request code for Links
|
||||
*/
|
||||
public static final int LINKS_REQUEST_CODE = 33;
|
||||
|
||||
/**
|
||||
* Request code for Teaching Guide
|
||||
*/
|
||||
public static final int TEACHINGGUIDE_REQUEST_CODE = 34;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -60,7 +60,7 @@ import es.ugr.swad.swadroid.modules.Messages;
|
|||
import es.ugr.swad.swadroid.modules.Notices;
|
||||
import es.ugr.swad.swadroid.modules.downloads.DownloadsManager;
|
||||
import es.ugr.swad.swadroid.modules.groups.MyGroupsManager;
|
||||
import es.ugr.swad.swadroid.modules.information.Introduction;
|
||||
import es.ugr.swad.swadroid.modules.information.Information;
|
||||
import es.ugr.swad.swadroid.modules.notifications.Notifications;
|
||||
import es.ugr.swad.swadroid.modules.rollcall.Rollcall;
|
||||
import es.ugr.swad.swadroid.modules.tests.Tests;
|
||||
|
@ -225,9 +225,34 @@ public class SWADMain extends MenuExpandableListActivity {
|
|||
|
||||
|
||||
} else if (keyword.equals(getString(R.string.introductionModuleLabel))) {
|
||||
activity = new Intent(getBaseContext(), Introduction.class);
|
||||
startActivityForResult(activity, Constants.INTRODUCTION_REQUEST_CODE);
|
||||
}
|
||||
activity = new Intent(getBaseContext(), Information.class);
|
||||
activity.putExtra("requestCode", Constants.INTRODUCTION_REQUEST_CODE);
|
||||
startActivityForResult(activity, Constants.INTRODUCTION_REQUEST_CODE);
|
||||
} else if (keyword.equals(getString(R.string.faqsModuleLabel))) {
|
||||
activity = new Intent(getBaseContext(), Information.class);
|
||||
activity.putExtra("requestCode", Constants.FAQS_REQUEST_CODE);
|
||||
startActivityForResult(activity, Constants.FAQS_REQUEST_CODE);
|
||||
} else if (keyword.equals(getString(R.string.bibliographyModuleLabel))) {
|
||||
activity = new Intent(getBaseContext(), Information.class);
|
||||
activity.putExtra("requestCode", Constants.BIBLIOGRAPHY_REQUEST_CODE);
|
||||
startActivityForResult(activity, Constants.BIBLIOGRAPHY_REQUEST_CODE);
|
||||
} else if (keyword.equals(getString(R.string.practicesprogramModuleLabel))) {
|
||||
activity = new Intent(getBaseContext(), Information.class);
|
||||
activity.putExtra("requestCode", Constants.PRACTICESPROGRAM_REQUEST_CODE);
|
||||
startActivityForResult(activity, Constants.PRACTICESPROGRAM_REQUEST_CODE);
|
||||
} else if (keyword.equals(getString(R.string.theoryprogramModuleLabel))) {
|
||||
activity = new Intent(getBaseContext(), Information.class);
|
||||
activity.putExtra("requestCode", Constants.THEORYPROGRAM_REQUEST_CODE);
|
||||
startActivityForResult(activity, Constants.THEORYPROGRAM_REQUEST_CODE);
|
||||
} else if (keyword.equals(getString(R.string.linksModuleLabel))) {
|
||||
activity = new Intent(getBaseContext(), Information.class);
|
||||
activity.putExtra("requestCode", Constants.LINKS_REQUEST_CODE);
|
||||
startActivityForResult(activity, Constants.LINKS_REQUEST_CODE);
|
||||
} else if (keyword.equals(getString(R.string.teachingguideModuleLabel))) {
|
||||
activity = new Intent(getBaseContext(), Information.class);
|
||||
activity.putExtra("requestCode", Constants.TEACHINGGUIDE_REQUEST_CODE);
|
||||
startActivityForResult(activity, Constants.TEACHINGGUIDE_REQUEST_CODE);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -1,67 +0,0 @@
|
|||
/**
|
||||
* introduction module for get courses's introduction
|
||||
*
|
||||
* @author Jose Antonio Guerrero Aviles <cany20@gmail.com>
|
||||
*/
|
||||
|
||||
package es.ugr.swad.swadroid.modules.information;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import org.xmlpull.v1.XmlPullParserException;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.webkit.WebView;
|
||||
import android.widget.ImageView;
|
||||
import android.widget.TextView;
|
||||
import es.ugr.swad.swadroid.R;
|
||||
import es.ugr.swad.swadroid.modules.Module;
|
||||
|
||||
|
||||
public class Introduction extends Module {
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
|
||||
|
||||
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.webview_information_screen_layout);
|
||||
WebView webview = (WebView) this.findViewById(R.id.contentWebView);
|
||||
|
||||
ImageView moduleIcon = (ImageView) this.findViewById(R.id.moduleIcon);
|
||||
moduleIcon.setBackgroundResource(R.drawable.notif);
|
||||
|
||||
TextView moduleText = (TextView) this.findViewById(R.id.moduleName);
|
||||
moduleText.setText(R.string.introductionModuleLabel);
|
||||
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void requestService() throws NoSuchAlgorithmException,
|
||||
IOException, XmlPullParserException {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void connect() {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void postConnect() {
|
||||
// TODO Auto-generated method stub
|
||||
finish();
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onError() {
|
||||
// TODO Auto-generated method stub
|
||||
|
||||
}
|
||||
|
||||
}
|
Loading…
Reference in New Issue
Block a user