Ja funciona lo de canviar el server. I alguna altra petita modificació

Imanol-Mikel Barba Sabariego
1 parent ebb9bbda
Showing 18 changed files with 45 additions and 28 deletions
bin/UPC_NEWS_v0.apk
bin/classes.dex
bin/classes/com/upc/pbe/upcnews/HTMLParser.class
bin/classes/com/upc/pbe/upcnews/Parser.class
bin/classes/com/upc/pbe/upcnews/Playlist.class
bin/jarlist.cache
bin/res/drawable-hdpi/ic_action_search.png
bin/res/drawable-hdpi/ic_launcher.png
bin/res/drawable-ldpi/ic_launcher.png
bin/res/drawable-mdpi/ic_action_search.png
bin/res/drawable-mdpi/ic_launcher.png
bin/res/drawable-xhdpi/ic_action_search.png
bin/res/drawable-xhdpi/ic_launcher.png
bin/resources.ap_
gen/com/upc/pbe/upcnews/R.java
res/layout/main_activity.xml
res/values/strings.xml
src/com/upc/pbe/upcnews/MainActivity.java
+# cache for current jar dependecy. DO NOT EDIT.
+# format is <lastModified> <length> <SHA-1> <path>
+# Encoding is UTF-8
@@ -15,30 +15,34 @@ public final class R {
         public static final int ic_launcher=0x7f020001;
     }
     public static final class id {
-        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 int AbsoluteLayout1=0x7f080000;
+        public static final int button=0x7f080003;
+        public static final int itemprefs=0x7f080005;
+        public static final int menu_settings=0x7f080004;
+        public static final int textViewRoute=0x7f080002;
+        public static final int textViewXml=0x7f080001;
     }
     public static final class layout {
         public static final int main_activity=0x7f030000;
     }
     public static final class menu {
-        public static final int activity_main=0x7f060000;
+        public static final int activity_main=0x7f070000;
+        public static final int menu=0x7f070001;
     }
     public static final class string {
-        public static final int app_name=0x7f040000;
-        public static final int descarregar=0x7f040004;
-        public static final int hello_world=0x7f040001;
-        public static final int hint=0x7f040005;
-        public static final int menu_settings=0x7f040002;
-        public static final int prefs=0x7f040008;
-        public static final int title_activity_main=0x7f040003;
-        public static final int url=0x7f040006;
-        public static final int urlhint=0x7f040007;
+        public static final int app_name=0x7f050000;
+        public static final int descarregar=0x7f050003;
+        public static final int hint=0x7f050004;
+        public static final int menu_settings=0x7f050001;
+        public static final int prefs=0x7f050007;
+        public static final int title_activity_main=0x7f050002;
+        public static final int url=0x7f050005;
+        public static final int urlhint=0x7f050006;
     }
     public static final class style {
-        public static final int AppTheme=0x7f050000;
+        public static final int AppTheme=0x7f060000;
+    }
+    public static final class xml {
+        public static final int prefs=0x7f040000;
     }
 }
@@ -5,7 +5,7 @@
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     tools:ignore="Deprecated" >
-
+
     <TextView
         android:id="@+id/textViewXml"
         android:layout_width="301dp"
@@ -16,7 +16,7 @@
         android:hint="@string/hint"
         android:scrollbarStyle="insideInset"
         android:scrollbars="vertical" />
-
+
     <TextView
         android:id="@+id/textViewRoute"
         android:layout_width="250dp"
 <resources>
     <string name="app_name">UPC_NEWS_v0</string>
-    <string name="hello_world">Hello world!</string>
     <string name="menu_settings">Settings</string>
     <string name="title_activity_main">MainActivity</string>
-    <string name="descarregar">Start</string>
-    <string name="hint">Click to Start Button...</string>
+    <string name="descarregar">Refresh</string>
+    <string name="hint">Click to Start Button.</string>
     <string name="url">URL server</string>
-    <string name="urlhint">Set the route from the server</string>
+    <string name="urlhint">Set the route from the server (without http://)</string>
     <string name="prefs">Preferences</string>
 </resources>
 \ No newline at end of file
@@ -17,7 +17,6 @@ public class MainActivity extends Activity implements OnClickListener {
 	final static String TAG = "Main";
 	Button buttonDescarrega;
-	String url = "http://www.google.es";
 	String file = "ejemplo.xml";
 	String folder = "Environment.getExternalStorageDirectory.getPath()"; // hauria de ser /sdcard/downloads
 	TextView showText, showRoute;
@@ -31,27 +30,39 @@ public class MainActivity extends Activity implements OnClickListener {
 		buttonDescarrega.setOnClickListener(this);
 		showText = (TextView) findViewById(R.id.textViewXml);
 		showRoute = (TextView) findViewById(R.id.textViewRoute);
-		showRoute.setText("Server: " + url);
+	
+		this.descarregarIMostrar();
 	}
+	
 	public boolean onCreateOptionsMenu(Menu menu) {
 		getMenuInflater().inflate(R.menu.menu, menu);
 		return true;
 	}
+	
+	public String getUrl(){
+		String u = ((UpcApp)getApplication()).getUrl();
+		showRoute.setText("Server: " + u);
+		return u;
+	}
 	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();
-		showText.setText(html);
+		this.descarregarIMostrar();
 		// HTMLParser pars = new HTMLParser((String) html);
 		// ArrayList<String> directoris = pars.parse();
 		// showText.setText((CharSequence) directoris);
 	}
+	
+	public void descarregarIMostrar(){
+		Descarrega d = new Descarrega(this.getUrl(), file, folder);
+		Toast.makeText(this, "Download succesfull", Toast.LENGTH_LONG).show();
+		CharSequence html = (CharSequence) d.doInBackground();
+		showText.setText(html);
+	}
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {