From 244dae48e63b34e290e3dd09cd849624aec61cfd Mon Sep 17 00:00:00 2001
From: Jose Antonio Guerrero Aviles <antonioguerreroaviles@gmail.com>
Date: Mon, 18 Nov 2013 17:12:26 +0100
Subject: [PATCH] Fixed some errors in the Information Module. Created a simple
 layout for the information modules. No functionality. Only loads a blank
 screen

---
 .../bin/android-pulltorefresh.jar             | Bin 76445 -> 76445 bytes
 SWADroid/AndroidManifest.xml                  |   2 +-
 .../webview_information_screen_layout.xml     |  30 +++++++-----------
 .../modules/information/Introduction.java     |  13 ++++++--
 4 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/Android-PullToRefresh/bin/android-pulltorefresh.jar b/Android-PullToRefresh/bin/android-pulltorefresh.jar
index 6ab093579e0d51fec1f2b22dde22d14c2a7121e1..a898ab6a97fd0e54a239c98002c37d94273c5df0 100644
GIT binary patch
delta 35
qcmbPxm1XW#7M=iaW)=|!4h{|mz0yXWtvrmLB20Rv+rvc|-NXQ-zX&=2

delta 35
qcmbPxm1XW#7M=iaW)=|!4h{|mg@Q(&tvrmLB1{Se+rvc|-NXQ*+Xxf@

diff --git a/SWADroid/AndroidManifest.xml b/SWADroid/AndroidManifest.xml
index 3501e2da..ada37780 100644
--- a/SWADroid/AndroidManifest.xml
+++ b/SWADroid/AndroidManifest.xml
@@ -214,7 +214,7 @@
         
         
         <activity
-                android:name=".modules.introduction.Introduction"
+                android:name=".modules.information.Introduction"
                 android:label="@string/introductionModuleLabel"
                 android:theme="@@android:style/Theme.NoTitleBar">
         </activity>
diff --git a/SWADroid/res/layout/webview_information_screen_layout.xml b/SWADroid/res/layout/webview_information_screen_layout.xml
index ca4edded..9df44cc2 100644
--- a/SWADroid/res/layout/webview_information_screen_layout.xml
+++ b/SWADroid/res/layout/webview_information_screen_layout.xml
@@ -1,24 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		     android:layout_width="match_parent"
+		     android:layout_height="match_parent"
+		     android:background="@color/background"
+		     android:orientation="vertical">
 
-
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-
-
-              android:background="@color/background"
-              android:orientation="vertical">
-
-
-
-    <include layout="@layout/action_bar"/>
-
-
-
-    <WebView 
-		android:id="@+id/webview_dialog"
-		android:layout_width="match_parent"
-		android:layout_height="match_parent" >
-	</WebView>
+    		<include layout="@layout/action_bar"/>
+    	
+		    <WebView 
+				android:id="@+id/webview_dialog"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent" >
+			</WebView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/information/Introduction.java b/SWADroid/src/es/ugr/swad/swadroid/modules/information/Introduction.java
index 5034a3c8..63db033e 100644
--- a/SWADroid/src/es/ugr/swad/swadroid/modules/information/Introduction.java
+++ b/SWADroid/src/es/ugr/swad/swadroid/modules/information/Introduction.java
@@ -12,6 +12,8 @@ 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;
 
@@ -21,10 +23,17 @@ public class Introduction extends Module {
 	@Override
     protected void onCreate(Bundle savedInstanceState) {
 		
-		WebView webview;
+		
+		
         super.onCreate(savedInstanceState);
         setContentView(R.layout.webview_information_screen_layout);
-        webview = (WebView) this.findViewById(R.id.contentWebView);
+        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);
        
     }