From 74eea6c1e5184ac05b2e93a7ebb0110eec5607c1 Mon Sep 17 00:00:00 2001
From: Equip de Desenvolupadors de PBE <imanol@imanolbarba.net>
Date: Mon, 26 Nov 2012 00:04:41 +0000
Subject: [PATCH] 

---
 gen/com/upc/pbe/upcnews/R.java            | 15 +++++++--------
 res/layout/directori.xml                  | 26 --------------------------
 res/layout/dirs.xml                       |  8 +++++---
 res/xml/prefs.xml                         |  2 +-
 src/com/upc/pbe/upcnews/Descarrega.java   |  3 +--
 src/com/upc/pbe/upcnews/Directoris.java   | 17 +++++++++++------
 src/com/upc/pbe/upcnews/MainActivity.java | 12 ++++--------
 src/com/upc/pbe/upcnews/Prefs.java        |  4 ++++
 src/com/upc/pbe/upcnews/UpcApp.java       |  2 +-
 9 files changed, 34 insertions(+), 55 deletions(-)
 delete mode 100644 res/layout/directori.xml

diff --git a/gen/com/upc/pbe/upcnews/R.java b/gen/com/upc/pbe/upcnews/R.java
index 6804691..32e1724 100644
--- a/gen/com/upc/pbe/upcnews/R.java
+++ b/gen/com/upc/pbe/upcnews/R.java
@@ -16,24 +16,23 @@ public final class R {
     }
     public static final class id {
         public static final int AbsoluteLayout1=0x7f080005;
-        public static final int LinearLayout1=0x7f080003;
+        public static final int LinearLayout1=0x7f080002;
         public static final int button=0x7f080008;
-        public static final int buttonPlay=0x7f080000;
         public static final int imageView1=0x7f080009;
         public static final int itemhelp=0x7f08000c;
         public static final int itemprefs=0x7f08000b;
         public static final int menu_settings=0x7f08000a;
-        public static final int textView1=0x7f080001;
+        public static final int textView1=0x7f080003;
         public static final int textView2=0x7f080004;
         public static final int textViewRoute=0x7f080007;
+        public static final int textViewTitle=0x7f080000;
         public static final int textViewXml=0x7f080006;
-        public static final int text_out=0x7f080002;
+        public static final int text_out=0x7f080001;
     }
     public static final class layout {
-        public static final int directori=0x7f030000;
-        public static final int dirs=0x7f030001;
-        public static final int help=0x7f030002;
-        public static final int main_activity=0x7f030003;
+        public static final int dirs=0x7f030000;
+        public static final int help=0x7f030001;
+        public static final int main_activity=0x7f030002;
     }
     public static final class menu {
         public static final int activity_main=0x7f070000;
diff --git a/res/layout/directori.xml b/res/layout/directori.xml
deleted file mode 100644
index c95865d..0000000
--- a/res/layout/directori.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?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" >
-

-    <Button
-        android:id="@+id/buttonPlay"
-        style="?android:attr/buttonStyleSmall"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginRight="36dp"
-        android:text="@string/desc" />
-

-    <TextView
-        android:id="@+id/textView1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginLeft="42dp"
-        android:text="@string/dir"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/dirs.xml b/res/layout/dirs.xml
index 52ffff7..1865f4c 100644
--- a/res/layout/dirs.xml
+++ b/res/layout/dirs.xml
@@ -5,13 +5,14 @@
     android:orientation="vertical" >
 
     <TextView
-        android:id="@+id/textView1"
+        android:id="@+id/textViewTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/directoris"
+        android:layout_gravity="right"
         android:textAppearance="?android:attr/textAppearanceLarge" />
 
+    <!-- Vista en llista -->
+
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
@@ -20,6 +21,7 @@
             android:id="@+id/text_out"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_gravity="right"
             android:textAppearance="?android:attr/textAppearanceMedium" />
     </ScrollView>
 
diff --git a/res/xml/prefs.xml b/res/xml/prefs.xml
index 29c1127..46247f7 100644
--- a/res/xml/prefs.xml
+++ b/res/xml/prefs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
-    <EditTextPreference android:key="s" android:title="@string/url" android:summary="@string/urlhint"/>
+    <EditTextPreference android:key="server" android:title="@string/url" android:summary="@string/urlhint"/>
     
 
 </PreferenceScreen>
\ 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 cad14f5..f89aeea 100644
--- a/src/com/upc/pbe/upcnews/Descarrega.java
+++ b/src/com/upc/pbe/upcnews/Descarrega.java
@@ -79,8 +79,7 @@ public class Descarrega extends AsyncTask<Object, Object, Object>{
 			BufferedReader in = new BufferedReader(new InputStreamReader(
 					conn.getInputStream()));
 			Log.d(TAG, "\nDescarregant: \n");
-			Log.d(TAG, ">> URL: " + url + " >> Nom: " + nomarxiu
-					+ " >> Tamany: " + conn.getContentLength() + " bytes");
+			Log.d(TAG, ">> URL: " + url + " >> Tamany: " + conn.getContentLength() + " bytes");
 			String inputLine;
 			while ((inputLine = in.readLine()) != null) {
 				//Log.d(TAG, inputLine);
diff --git a/src/com/upc/pbe/upcnews/Directoris.java b/src/com/upc/pbe/upcnews/Directoris.java
index 31e91e1..e6175d0 100644
--- a/src/com/upc/pbe/upcnews/Directoris.java
+++ b/src/com/upc/pbe/upcnews/Directoris.java
@@ -10,27 +10,32 @@ import android.widget.TextView;
 public class Directoris extends Activity {
 
 	final static String TAG = "Directoris";
-	
+
+	TextView title;
 	TextView textout;
 	String s;
 
 	public void onCreate(Bundle savedInstanceState) {
-		
+		Log.d(TAG, "onCreated");
+
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.dirs);
 
 		textout = (TextView) findViewById(R.id.text_out);
+		title = (TextView) findViewById(R.id.textViewTitle);
+
+		title.setText("Server --> " + ((UpcApp) getApplication()).getUrl());
 
 		s = ((UpcApp) getApplication()).getDesc();
 		HTMLParser pars = new HTMLParser((String) s);
 		ArrayList<String> dirs = pars.parse();
 
 		for (int i = 0; i < dirs.size(); i++) {
-			
-			Log.d(TAG, "Directori " +i);
-			textout.append(String.format("\nDirectori: %s\n",dirs.get(i).toString()));
+
+			Log.d(TAG, "Directori " + i);
+			textout.append(String.format("\nDirectori: %s\n", dirs.get(i)
+					.toString()));
 		}
 
 	}
-
 }
diff --git a/src/com/upc/pbe/upcnews/MainActivity.java b/src/com/upc/pbe/upcnews/MainActivity.java
index df0ab88..842cc38 100644
--- a/src/com/upc/pbe/upcnews/MainActivity.java
+++ b/src/com/upc/pbe/upcnews/MainActivity.java
@@ -37,6 +37,7 @@ public class MainActivity extends Activity implements OnClickListener {
 
 	public boolean onCreateOptionsMenu(Menu menu) {
 		getMenuInflater().inflate(R.menu.menu, menu);
+		Log.d(TAG, "Menu");
 		return true;
 	}
 
@@ -50,7 +51,7 @@ public class MainActivity extends Activity implements OnClickListener {
 
 		Log.d(TAG, "onClicked");
 		this.descarregar();
-		((UpcApp)getApplication()).setDesc(html);
+		((UpcApp) getApplication()).setDesc(html);
 		startActivity(new Intent(this, Directoris.class));
 
 	}
@@ -59,13 +60,7 @@ public class MainActivity extends Activity implements OnClickListener {
 		Descarrega d = new Descarrega(this.getUrl(), file, folder);
 		Toast.makeText(this, "Download succesfull", Toast.LENGTH_LONG).show();
 		html = (String) d.doInBackground();
-		
-		//HTMLParser pars = new HTMLParser((String) html);
-		//ArrayList<String> dirs = pars.parse();
-		
-		//showText.setText(dirs.toString());
-		
-		
+
 	}
 
 	public boolean onOptionsItemSelected(MenuItem item) {
@@ -76,6 +71,7 @@ public class MainActivity extends Activity implements OnClickListener {
 			return true;
 		case R.id.itemhelp:
 			startActivity(new Intent(this, Help.class));
+			Log.d(TAG, "Help");
 			return true;
 		default:
 			return false;
diff --git a/src/com/upc/pbe/upcnews/Prefs.java b/src/com/upc/pbe/upcnews/Prefs.java
index 264d0ed..9ade761 100644
--- a/src/com/upc/pbe/upcnews/Prefs.java
+++ b/src/com/upc/pbe/upcnews/Prefs.java
@@ -2,11 +2,15 @@ package com.upc.pbe.upcnews;
 
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
+import android.util.Log;
 
 public class Prefs extends PreferenceActivity {
 
+	final static String TAG = "Preferences";
+
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
+		Log.d(TAG, "onCreated");
 		super.onCreate(savedInstanceState);
 		addPreferencesFromResource(R.xml.prefs);
 	}
diff --git a/src/com/upc/pbe/upcnews/UpcApp.java b/src/com/upc/pbe/upcnews/UpcApp.java
index faea7d0..e871e22 100644
--- a/src/com/upc/pbe/upcnews/UpcApp.java
+++ b/src/com/upc/pbe/upcnews/UpcApp.java
@@ -16,7 +16,7 @@ public class UpcApp extends Application implements OnSharedPreferenceChangeListe
 	String desc;
 	
 	public String getUrl() {
-		url = "http://" + prefs.getString("s", defaultUrl);
+		url = "http://" + prefs.getString("server", defaultUrl);
 		return url;
 	}
 
--
libgit2 0.22.2