From 35cdc54aacaa3accee6cd2df66da5481c4b296f3 Mon Sep 17 00:00:00 2001
From: Equip de Desenvolupadors de PBE <imanol@imanolbarba.net>
Date: Sat, 15 Dec 2012 21:38:47 +0000
Subject: [PATCH] Eliminado bug al girar la pantalla en help y cambiado el recurso a un .mid para ahorrar espacio

---
 AndroidManifest.xml                       | 2 +-
 res/raw/help.mid                          | Bin 0 -> 43187 bytes
 res/raw/help.mp3                          | Bin 3409637 -> 0 bytes
 res/values/strings.xml                    | 4 ++--
 src/com/upc/pbe/upcnews/Help.java         | 5 +++++
 src/com/upc/pbe/upcnews/MainActivity.java | 3 +--
 6 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 res/raw/help.mid
 delete mode 100644 res/raw/help.mp3

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a065888..6468994 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -28,7 +28,7 @@
         </activity>
         <activity android:name=".Prefs" >
         </activity>
-        <activity android:name=".Help" >
+        <activity android:name=".Help" android:configChanges="orientation">
         </activity>
         <activity android:name=".Directoris" >
         </activity>
diff --git a/res/raw/help.mid b/res/raw/help.mid
new file mode 100644
index 0000000..05fea80
Binary files /dev/null and b/res/raw/help.mid differ
diff --git a/res/raw/help.mp3 b/res/raw/help.mp3
deleted file mode 100644
index 2a3ed7d..0000000
Binary files a/res/raw/help.mp3 and /dev/null differ
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a065291..9bbcb14 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -17,7 +17,7 @@
     <string name="title">Llista de recursos</string>
     <string name="startbuttondescription">Tocar per iniciar</string>
     <string name="title_activity_video">VideoActivity</string>
-    <string name="helpText"> UPC News 0.7 Alpha rev. 148\n \u00A9 Copyright Universitat Politècnica de Catalunya 2012. Tots els 
+    <string name="helpText"> UPC News v1.0\n \u00A9 Copyright Universitat Politècnica de Catalunya 2012. Tots els 
         drets reservats.\n\n Membres de l\'equip de programadors:\n     Marc Siquier \n     Albert Quiroga\n     Imanol Barba
         \n     Marius Oltean\n\n Professor: Josep Pegueroles\n Assignatura: Projecte Bàsic de Enginyeria\n\n Aplicació dissenyada
         per Android 2.3.3 Gingerbread\n\n L\'aplicació permet connectarse a servidors Apache i reproduïr arxius .m3u8 
@@ -29,6 +29,6 @@
     <string name="alertVitamioNotInstalled">Alerta! Llibreries de Vitamio no instal·lades!</string>
     <string name="alertLogoDescription">Alerta!</string>
     <string name="itemType">Item type</string>
-    <string name="buffering_text">Buffering...</string>
+    <string name="buffering_text">Buffering…</string>
 
 </resources>
\ No newline at end of file
diff --git a/src/com/upc/pbe/upcnews/Help.java b/src/com/upc/pbe/upcnews/Help.java
index 3b2d32c..bb83465 100644
--- a/src/com/upc/pbe/upcnews/Help.java
+++ b/src/com/upc/pbe/upcnews/Help.java
@@ -1,6 +1,7 @@
 package com.upc.pbe.upcnews;
 
 import android.app.Activity;
+import android.content.res.Configuration;
 import android.media.MediaPlayer;
 import android.os.Bundle;
 import android.util.Log;
@@ -23,5 +24,9 @@ public class Help extends Activity{
 		Log.d(TAG, "onStopped");
 		super.onDestroy();
 	}
+	@Override
+	public void onConfigurationChanged(Configuration newConfig) {
+		super.onConfigurationChanged(newConfig);
+	}
 	
 }
diff --git a/src/com/upc/pbe/upcnews/MainActivity.java b/src/com/upc/pbe/upcnews/MainActivity.java
index 73ca1ad..15049f1 100644
--- a/src/com/upc/pbe/upcnews/MainActivity.java
+++ b/src/com/upc/pbe/upcnews/MainActivity.java
@@ -130,9 +130,8 @@ public class MainActivity extends Activity implements OnClickListener
 
 	/*
 	 * COSAS POR HACER
-	 * (RELEASE-CRITICAL) Controlar el flujo de datos al ver el video (intentad reproducir y veréis lo que os digo)
-	 * (NORMAL) Hacer streaming DE VERDAD (appendeando los videos, seria IMPRESIONANTE)
 	 * (NORMAL) Poner la defaultURL al server de PBE
+	 * (WHISLIST) Hacer streaming DE VERDAD (appendeando los videos, seria IMPRESIONANTE)
 	 * Borrar esta puta mierda
 	 */
 }
--
libgit2 0.22.2