From 9411cd3e9b695fc2696303b016463f7adc718409 Mon Sep 17 00:00:00 2001
From: Equip de Desenvolupadors de PBE <imanol@imanolbarba.net>
Date: Wed, 28 Nov 2012 14:07:17 +0000
Subject: [PATCH] 

---
 gen/com/upc/pbe/upcnews/R.java            | 33 ++++++++++++++++++++-------------
 res/layout/dirs.xml                       | 37 ++++++++++++++++++++++++++-----------
 res/layout/main_activity.xml              | 24 ++++++++++++++++--------
 res/values/strings.xml                    |  3 +++
 src/com/upc/pbe/upcnews/Directoris.java   | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------
 src/com/upc/pbe/upcnews/MainActivity.java |  1 -
 6 files changed, 121 insertions(+), 46 deletions(-)

diff --git a/gen/com/upc/pbe/upcnews/R.java b/gen/com/upc/pbe/upcnews/R.java
index 0911794..0ed4f8f 100644
--- a/gen/com/upc/pbe/upcnews/R.java
+++ b/gen/com/upc/pbe/upcnews/R.java
@@ -16,19 +16,23 @@ public final class R {
         public static final int ic_menu_name=0x7f020002;
     }
     public static final class id {
-        public static final int AbsoluteLayout1=0x7f080005;
-        public static final int LinearLayout1=0x7f080002;
-        public static final int button=0x7f080008;
-        public static final int imageView1=0x7f080006;
-        public static final int itemhelp=0x7f08000c;
-        public static final int itemprefs=0x7f08000b;
-        public static final int menu_settings=0x7f08000a;
-        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=0x7f080009;
-        public static final int text_out=0x7f080001;
+        public static final int AbsoluteLayout1=0x7f080008;
+        public static final int ImageView01=0x7f08000d;
+        public static final int ImageView1=0x7f08000c;
+        public static final int LinearLayout1=0x7f080000;
+        public static final int button=0x7f08000a;
+        public static final int button1=0x7f080002;
+        public static final int button2=0x7f080003;
+        public static final int button3=0x7f080004;
+        public static final int button4=0x7f080005;
+        public static final int itemhelp=0x7f080010;
+        public static final int itemprefs=0x7f08000f;
+        public static final int menu_settings=0x7f08000e;
+        public static final int textView1=0x7f080006;
+        public static final int textView2=0x7f080007;
+        public static final int textViewRoute=0x7f080009;
+        public static final int textViewTitle=0x7f080001;
+        public static final int textViewXml=0x7f08000b;
     }
     public static final class layout {
         public static final int dirs=0x7f030000;
@@ -41,6 +45,8 @@ public final class R {
     }
     public static final class string {
         public static final int app_name=0x7f050000;
+        public static final int button=0x7f05000c;
+        public static final int button1=0x7f05000d;
         public static final int desc=0x7f050009;
         public static final int descarregar=0x7f050003;
         public static final int dir=0x7f05000a;
@@ -49,6 +55,7 @@ public final class R {
         public static final int hint=0x7f050004;
         public static final int menu_settings=0x7f050001;
         public static final int prefs=0x7f050007;
+        public static final int title=0x7f05000e;
         public static final int title_activity_main=0x7f050002;
         public static final int url=0x7f050005;
         public static final int urlhint=0x7f050006;
diff --git a/res/layout/dirs.xml b/res/layout/dirs.xml
index 410d72d..bc2db93 100644
--- a/res/layout/dirs.xml
+++ b/res/layout/dirs.xml
@@ -1,28 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/LinearLayout1"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:gravity="center_horizontal"
     android:orientation="vertical" >
 
+    <!-- Vista en llista -->
+
     <TextView
         android:id="@+id/textViewTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="left"
+        android:layout_marginLeft="14dp"
+        android:text="@string/title"
         android:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <!-- Vista en llista -->
+    <Button
+        android:id="@+id/button1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="38dp" />
 
-    <ScrollView
+    <Button
+        android:id="@+id/button2"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" >
+        android:layout_height="wrap_content"
+        android:layout_marginTop="38dp" />
 
-        <TextView
-            android:id="@+id/text_out"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:textAppearance="?android:attr/textAppearanceMedium" />
-    </ScrollView>
+    <Button
+        android:id="@+id/button3"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="38dp" />
+
+    <Button
+        android:id="@+id/button4"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="38dp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/main_activity.xml b/res/layout/main_activity.xml
index dabcbbd..d6e798f 100644
--- a/res/layout/main_activity.xml
+++ b/res/layout/main_activity.xml
@@ -15,14 +15,6 @@
         android:text="@string/app_name"
         android:textAppearance="?android:attr/textAppearanceLarge" />
 
-    <ImageView
-        android:id="@+id/imageView1"
-        android:layout_width="134dp"
-        android:layout_height="134dp"
-        android:layout_x="84dp"
-        android:layout_y="50dp"
-        android:src="@drawable/ic_launcher" />
-
     <TextView
         android:id="@+id/textViewRoute"
         android:layout_width="250dp"
@@ -50,4 +42,20 @@
         android:scrollbarStyle="insideInset"
         android:scrollbars="vertical" />
 
+    <ImageView
+        android:id="@+id/ImageView1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_x="28dp"
+        android:layout_y="12dp"
+        android:src="@drawable/ic_launcher" />
+
+    <ImageView
+        android:id="@+id/ImageView01"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_x="223dp"
+        android:layout_y="14dp"
+        android:src="@drawable/ic_launcher" />
+
 </AbsoluteLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c391694..12af49f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -12,5 +12,8 @@
     <string name="desc">Play</string>
     <string name="dir">Directory</string>
     <string name="directoris">Directoris</string>
+    <string name="button">Button</string>
+    <string name="button1">Play</string>
+    <string name="title">Directories found:</string>
 
 </resources>
\ No newline at end of file
diff --git a/src/com/upc/pbe/upcnews/Directoris.java b/src/com/upc/pbe/upcnews/Directoris.java
index cec9a84..34930b2 100644
--- a/src/com/upc/pbe/upcnews/Directoris.java
+++ b/src/com/upc/pbe/upcnews/Directoris.java
@@ -3,39 +3,82 @@ package com.upc.pbe.upcnews;
 import java.util.ArrayList;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
-import android.widget.TextView;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
 
 public class Directoris extends Activity {
 
 	final static String TAG = "Directoris";
-
-	TextView title;
-	TextView textout;
 	String s;
 
+	ArrayList<Button> buttons = new ArrayList<Button>();
+	Button button1, button2, button3, button4;
+	
 	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());
+		this.crearButtons();	
 
 		s = ((UpcApp) getApplication()).getDesc();
 		HTMLParser pars = new HTMLParser();
 		ArrayList<String> dirs = pars.parse(s);
 
 		for (int i = 0; i < dirs.size(); i++) {
-
 			Log.d(TAG, "Directori " + i);
-			textout.append(String.format("\nDirectori: %s\n", dirs.get(i)
-					.toString()));
+			buttons.get(i).setVisibility(View.VISIBLE);
+			buttons.get(i).setText(dirs.get(i));
+			
 		}
 
 	}
-}
+
+	public boolean onCreateOptionsMenu(Menu menu) {
+		getMenuInflater().inflate(R.menu.menu, menu);
+		Log.d(TAG, "Menu");
+		return true;
+	}
+
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+		case R.id.itemprefs:
+			startActivity(new Intent(this, Prefs.class));
+			Log.d(TAG, "Preferences");
+			return true;
+		case R.id.itemhelp:
+			startActivity(new Intent(this, Help.class));
+			Log.d(TAG, "Help");
+			return true;
+		default:
+			return false;
+		}
+	}
+	
+	public void crearButtons(){
+		
+		
+		button1 = (Button)findViewById(R.id.button1);
+		button2 = (Button)findViewById(R.id.button2);
+		button3 = (Button)findViewById(R.id.button3);
+		button4 = (Button)findViewById(R.id.button4);
+		
+		
+		buttons.add(button1);
+		buttons.add(button2);
+		buttons.add(button3);
+		buttons.add(button4);
+		
+		button1.setVisibility(View.GONE);
+		button2.setVisibility(View.GONE);
+		button3.setVisibility(View.GONE);
+		button4.setVisibility(View.GONE);
+	}
+}
\ No newline at end of file
diff --git a/src/com/upc/pbe/upcnews/MainActivity.java b/src/com/upc/pbe/upcnews/MainActivity.java
index 842cc38..83b6e1b 100644
--- a/src/com/upc/pbe/upcnews/MainActivity.java
+++ b/src/com/upc/pbe/upcnews/MainActivity.java
@@ -32,7 +32,6 @@ public class MainActivity extends Activity implements OnClickListener {
 		showText = (TextView) findViewById(R.id.textViewXml);
 		showRoute = (TextView) findViewById(R.id.textViewRoute);
 		this.getUrl();
-
 	}
 
 	public boolean onCreateOptionsMenu(Menu menu) {
--
libgit2 0.22.2