From 05494523497144ad03c1496c7ef2de8aa3d25135 Mon Sep 17 00:00:00 2001
From: Equip de Desenvolupadors de PBE <imanol@imanolbarba.net>
Date: Wed, 7 Nov 2012 23:00:36 +0000
Subject: [PATCH] He canviat només un parell de coses del layout/main_activity.xml

---
 gen/com/upc/pbe/upcnews/R.java            |  8 +++++---
 res/layout/main_activity.xml              | 40 +++++++++++++++++++++++++++++-----------
 res/values/strings.xml                    |  4 ++--
 src/com/upc/pbe/upcnews/Descarrega.java   |  5 +++--
 src/com/upc/pbe/upcnews/MainActivity.java | 16 ++++++++++------
 5 files changed, 49 insertions(+), 24 deletions(-)

diff --git a/gen/com/upc/pbe/upcnews/R.java b/gen/com/upc/pbe/upcnews/R.java
index 67e85b1..3bad821 100644
--- a/gen/com/upc/pbe/upcnews/R.java
+++ b/gen/com/upc/pbe/upcnews/R.java
@@ -15,9 +15,11 @@ public final class R {
         public static final int ic_launcher=0x7f020001;
     }
     public static final class id {
-        public static final int button=0x7f070000;
-        public static final int menu_settings=0x7f070002;
-        public static final int textView1=0x7f070001;
+        public static final int AbsoluteLayout1=0x7f070000;
+        public static final int button=0x7f070003;
+        public static final int menu_settings=0x7f070004;
+        public static final int textViewRoute=0x7f070002;
+        public static final int textViewXml=0x7f070001;
     }
     public static final class layout {
         public static final int main_activity=0x7f030000;
diff --git a/res/layout/main_activity.xml b/res/layout/main_activity.xml
index 08cfcaf..3fe67b6 100644
--- a/res/layout/main_activity.xml
+++ b/res/layout/main_activity.xml
@@ -1,18 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout android:layout_width="match_parent"
+<AbsoluteLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/AbsoluteLayout1"
+    android:layout_width="wrap_content"
     android:layout_height="match_parent"
-    android:orientation="vertical" xmlns:android="http://schemas.android.com/apk/res/android">
-






+    tools:ignore="Deprecated" >
+

+    <TextView
+        android:id="@+id/textViewXml"
+        android:layout_width="301dp"
+        android:layout_height="386dp"
+        android:layout_x="11dp"
+        android:layout_y="81dp"
+        android:gravity="clip_vertical"
+        android:hint="@string/hint"
+        android:scrollbarStyle="insideInset"
+        android:scrollbars="vertical" />
+


+    <TextView
+        android:id="@+id/textViewRoute"
+        android:layout_width="250dp"
+        android:layout_height="22dp"
+        android:layout_x="35dp"
+        android:layout_y="8dp"
+        android:textSize="@android:dimen/thumbnail_height" />
+
     <Button
         android:id="@+id/button"
-        android:layout_width="match_parent"
+        android:layout_width="258dp"
         android:layout_height="wrap_content"
+        android:layout_x="31dp"
+        android:layout_y="30dp"
         android:text="@string/descarregar" />
-



-    <TextView
-        android:id="@+id/textView1"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:hint="@string/hint" />
 
-</LinearLayout>
\ No newline at end of file
+</AbsoluteLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0d81b77..15bef7a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4,7 +4,7 @@
     <string name="hello_world">Hello world!</string>
     <string name="menu_settings">Settings</string>
     <string name="title_activity_main">MainActivity</string>
-    <string name="descarregar">Descarrega</string>
-    <string name="hint">Esperant contingut...</string>
+    <string name="descarregar">Start</string>
+    <string name="hint">Click to Start Button...</string>
 
 </resources>
\ No newline at end of file
diff --git a/src/com/upc/pbe/upcnews/Descarrega.java b/src/com/upc/pbe/upcnews/Descarrega.java
index 1baa1ed..ad76031 100644
--- a/src/com/upc/pbe/upcnews/Descarrega.java
+++ b/src/com/upc/pbe/upcnews/Descarrega.java
@@ -82,10 +82,11 @@ public class Descarrega extends AsyncTask<Object, Object, Object>{
 					+ " >> Tamany: " + conn.getContentLength() + " bytes");
 			String inputLine;
 			while ((inputLine = in.readLine()) != null) {
-				Log.d(TAG, inputLine);
-				html = html + "\n" + inputLine;
+				//Log.d(TAG, inputLine);
+				html = html + "\r" + inputLine;
 			}
 			Log.d(TAG, "Descarrega finalitzada");
+			
 			in.close();
 		} catch (MalformedURLException e) {
 			Log.d(TAG, "excepcio 1");
diff --git a/src/com/upc/pbe/upcnews/MainActivity.java b/src/com/upc/pbe/upcnews/MainActivity.java
index b1a44fc..7fe54dd 100644
--- a/src/com/upc/pbe/upcnews/MainActivity.java
+++ b/src/com/upc/pbe/upcnews/MainActivity.java
@@ -1,6 +1,5 @@
 package com.upc.pbe.upcnews;
 
-import com.upc.pbe.upcnews.R;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -9,14 +8,15 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.TextView;
+import android.widget.Toast;
 
 public class MainActivity extends Activity implements OnClickListener {
 	final static String TAG = "Main";
 	Button buttonDescarrega;
-	String url = "http://10.0.2.100";
-	String file = "example.m3u8";
+	String url = "http://www.google.es";
+	String file = "ejemplo.xml";
 	String folder = "C:\\Users\\Usuario\\Downloads\\";
-	TextView show;
+	TextView showText, showRoute;
 	
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -25,15 +25,19 @@ public class MainActivity extends Activity implements OnClickListener {
 		Log.d(TAG, "onCreated");
 		buttonDescarrega = (Button) findViewById(R.id.button);
 		buttonDescarrega.setOnClickListener(this);
-		show = (TextView) findViewById(R.id.textView1);
+		showText = (TextView) findViewById(R.id.textViewXml);
+		showRoute = (TextView) findViewById(R.id.textViewRoute);
+		showRoute.setText("Server: " + url);
 		
 	}
 
 	public void onClick(View v) {
+		
 		Log.d(TAG, "onClicked");
 		Descarrega d = new Descarrega(url, file, folder);
+		Toast.makeText(this, "Download succesfull", Toast.LENGTH_LONG).show();
 		CharSequence html = (CharSequence) d.doInBackground();
-		show.setText(html);
+		showText.setText(html);
 		
 		
 	}
--
libgit2 0.22.2