From 5da67a8ee312e8506a58c5d403c3ad342e7ac270 Mon Sep 17 00:00:00 2001
From: Helena Rodriguez <hrgijon@gmail.com>
Date: Tue, 12 Jun 2012 15:39:46 +0200
Subject: [PATCH] Added initial design for group choice

---
 SWADroid/res/layout/group_choice.xml          | 26 +++++++++++++++++++
 SWADroid/res/layout/group_list_item.xml       | 13 ++++++++++
 SWADroid/res/values-ca/strings.xml            |  3 +++
 SWADroid/res/values-de/strings.xml            |  3 +++
 SWADroid/res/values-es/strings.xml            |  3 +++
 SWADroid/res/values/strings.xml               |  3 +++
 SWADroid/src/es/ugr/swad/swadroid/Global.java |  2 +-
 .../modules/downloads/DownloadsManager.java   |  9 ++-----
 8 files changed, 54 insertions(+), 8 deletions(-)
 create mode 100644 SWADroid/res/layout/group_choice.xml
 create mode 100644 SWADroid/res/layout/group_list_item.xml

diff --git a/SWADroid/res/layout/group_choice.xml b/SWADroid/res/layout/group_choice.xml
new file mode 100644
index 00000000..2611ebcb
--- /dev/null
+++ b/SWADroid/res/layout/group_choice.xml
@@ -0,0 +1,26 @@
+<?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:orientation="vertical" >
+     <include layout="@layout/action_bar"/>    
+ 
+	<TextView
+	  android:id="@+id/listText"
+	  android:layout_width="fill_parent"
+	  android:layout_height="wrap_content"
+	  android:padding="20dip"
+	  android:textColor="@color/foreground1"
+	  android:textSize="24sp"
+      android:visibility="gone">
+	</TextView>
+	
+    <include android:id="@+id/courseNameLayout" layout="@layout/course_or_group_name"/>
+    <ExpandableListView
+        android:id="@+id/android:list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:cacheColorHint="@color/background" >
+    </ExpandableListView>   
+
+</LinearLayout>
\ No newline at end of file
diff --git a/SWADroid/res/layout/group_list_item.xml b/SWADroid/res/layout/group_list_item.xml
new file mode 100644
index 00000000..e9f2b987
--- /dev/null
+++ b/SWADroid/res/layout/group_list_item.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" 
+    >
+	<RadioButton android:id="@+id/radioButton"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="Prueba"
+	/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/SWADroid/res/values-ca/strings.xml b/SWADroid/res/values-ca/strings.xml
index bd86d683..c16878aa 100644
--- a/SWADroid/res/values-ca/strings.xml
+++ b/SWADroid/res/values-ca/strings.xml
@@ -106,4 +106,7 @@
 	<string name="shareBodyMsg">Estic usant #SWADroid en el meu Android per a accedir a la plataforma de teleformació SWAD.\nAconsegueix-ho gratis aquí:
 		 https://market.android.com/details?id=es.ugr.swad.swadroid</string>
 	<string name="mailingListTitle">Llista de correu</string>
+	<string name="vacants">Vacants</string>
+	<!-- <string name="numStudent">Nombre d'estud.</string> -->
+	<!-- <string name="maxStudent">Màxim d'estud.</string> -->
 </resources>
\ No newline at end of file
diff --git a/SWADroid/res/values-de/strings.xml b/SWADroid/res/values-de/strings.xml
index 0e1b43d7..9a371077 100644
--- a/SWADroid/res/values-de/strings.xml
+++ b/SWADroid/res/values-de/strings.xml
@@ -130,4 +130,7 @@ Es muss mindestens ein Antworttyp ausgewählt werden</string>
     <string name="parent_icon">Zeigt oberen Ordner</string>
     <string name="refresh_icon">Updates</string>
     <string name="Group">Gruppe</string>
+    <string name="vacants">Frei</string>
+	<string name="numStudent">Anzahl der Stud.</string>
+	<string name="maxStudent">Max. Stud</string>
 </resources>
\ No newline at end of file
diff --git a/SWADroid/res/values-es/strings.xml b/SWADroid/res/values-es/strings.xml
index 3d56c476..bef24621 100644
--- a/SWADroid/res/values-es/strings.xml
+++ b/SWADroid/res/values-es/strings.xml
@@ -177,5 +177,8 @@
     <string name="openFile">Abrir</string>
     <string name="downloadFile">Volver a descargar</string>
     <string name="deleteFile">Borrar</string>
+    <string name="vacants">Vacantes</string>
+	<string name="numStudent">Nº de estud.</string>
+	<string name="maxStudent">Máx.estud</string>
     
 </resources>
diff --git a/SWADroid/res/values/strings.xml b/SWADroid/res/values/strings.xml
index 8ee0aa15..4c1a1ff8 100644
--- a/SWADroid/res/values/strings.xml
+++ b/SWADroid/res/values/strings.xml
@@ -182,4 +182,7 @@
     <string name="openFile">Open</string>
     <string name="downloadFile">Download again</string>
     <string name="deleteFile">Delete</string>
+    <string name="vacants">Vacants</string>
+	<string name="numStudent">No. of stud.</string>
+	<string name="maxStudent">Max.stud.</string>
 </resources>
diff --git a/SWADroid/src/es/ugr/swad/swadroid/Global.java b/SWADroid/src/es/ugr/swad/swadroid/Global.java
index c486cabe..65b64d95 100644
--- a/SWADroid/src/es/ugr/swad/swadroid/Global.java
+++ b/SWADroid/src/es/ugr/swad/swadroid/Global.java
@@ -31,7 +31,7 @@ public class Global {
 	/**
 	 * SWAD application key
 	 */
-	private static final String AppKey = "HTC-Desire";
+	private static final String AppKey = "";
 	/**
 	 * Server URL
 	 */
diff --git a/SWADroid/src/es/ugr/swad/swadroid/modules/downloads/DownloadsManager.java b/SWADroid/src/es/ugr/swad/swadroid/modules/downloads/DownloadsManager.java
index c27d7945..6d1aafa8 100644
--- a/SWADroid/src/es/ugr/swad/swadroid/modules/downloads/DownloadsManager.java
+++ b/SWADroid/src/es/ugr/swad/swadroid/modules/downloads/DownloadsManager.java
@@ -181,13 +181,9 @@ public class DownloadsManager extends MenuActivity {
 			    		break;
 			    	case 2:
 			    		File f =  new File(directoryPath, fileName);
-			    		if(f.exists()){
+			    		if(f.exists())
 			    			f.delete();
-			    			 Toast.makeText(getApplicationContext(),"File " + fileName +"has been deleted", Toast.LENGTH_SHORT).show();
-			    		}else{
-			    			 Toast.makeText(getApplicationContext(),"File " + fileName +"has not been deleted because it does not exits", Toast.LENGTH_SHORT).show();
-					    		
-			    		}
+			    		//TODO change icon file to show the file is not downloaded	
 			    		break;
 		    		
 		    	}
@@ -216,7 +212,6 @@ public class DownloadsManager extends MenuActivity {
 						createNotification(directoryPath,navigator.getURLFile(chosenNodeName));
 					else{
 						fileOptions.show();
-						//openFileDefaultApp(directoryPath+File.separator+fileName);
 						
 					}					
 					//TODO activate request for notification download file when it is available