From ba5a364f766951967e381ef6c35b4df9d88e87ce Mon Sep 17 00:00:00 2001 From: Equip de Desenvolupadors de PBE Date: Sun, 9 Dec 2012 19:38:14 +0000 Subject: [PATCH] defaultURL --- gen/com/upc/pbe/upcnews/R.java | 4 ++-- res/layout/main_activity.xml | 1 - res/values/strings.xml | 2 +- res/xml/prefs.xml | 2 +- src/com/upc/pbe/upcnews/UpcApp.java | 3 +-- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/gen/com/upc/pbe/upcnews/R.java b/gen/com/upc/pbe/upcnews/R.java index 1162f1b..d51d519 100644 --- a/gen/com/upc/pbe/upcnews/R.java +++ b/gen/com/upc/pbe/upcnews/R.java @@ -69,14 +69,14 @@ public final class R { public static final int app_name=0x7f070000; public static final int button=0x7f07000c; public static final int button1=0x7f07000d; - public static final int defaultURL=0x7f070012; + public static final int defaultURL=0x7f070013; public static final int desc=0x7f070009; public static final int descarregar=0x7f070003; public static final int dir=0x7f07000a; public static final int directoris=0x7f07000b; public static final int hello_world=0x7f070010; public static final int help=0x7f070008; - public static final int helpText=0x7f070013; + public static final int helpText=0x7f070012; public static final int hint=0x7f070004; public static final int menu_settings=0x7f070001; public static final int prefs=0x7f070007; diff --git a/res/layout/main_activity.xml b/res/layout/main_activity.xml index bcaf58c..0544109 100644 --- a/res/layout/main_activity.xml +++ b/res/layout/main_activity.xml @@ -44,7 +44,6 @@ android:layout_alignTop="@+id/textViewXml" android:layout_centerHorizontal="true" android:layout_marginTop="21dp" - android:text="@string/defaultURL" android:textAppearance="?android:attr/textAppearanceSmall" /> \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 851cc66..c1c1a98 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -18,7 +18,6 @@ Click to Start Hello world! VideoActivity - http://imanolbarba.myftp.biz/PBE UPC News 0.7 Alpha rev. 148\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 @@ -27,5 +26,6 @@ documents de Requirements Specification, Project Plan i Final Report. \n\n Per reportar errors, siusplau dirigeixi\'s a la Universitat o escrigui un mail als desenvolupadors.\n\n Necessària la instal·lació de la llibreria Vitamio per reproduïr arxius .ts + imanolbarba.myftp.biz/PBE \ No newline at end of file diff --git a/res/xml/prefs.xml b/res/xml/prefs.xml index 5dc7d8f..f931580 100644 --- a/res/xml/prefs.xml +++ b/res/xml/prefs.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/src/com/upc/pbe/upcnews/UpcApp.java b/src/com/upc/pbe/upcnews/UpcApp.java index 8104535..3e737e3 100644 --- a/src/com/upc/pbe/upcnews/UpcApp.java +++ b/src/com/upc/pbe/upcnews/UpcApp.java @@ -12,7 +12,6 @@ public class UpcApp extends Application implements OnSharedPreferenceChangeListe final static String TAG = "Application"; private SharedPreferences prefs; - private String defaultUrl = "imanolbarba.myftp.biz/PBE"; private String url = null; private String desc; private final static String localPath = Environment.getExternalStorageDirectory().getPath() + "/UPC NEWS/"; @@ -23,7 +22,7 @@ public class UpcApp extends Application implements OnSharedPreferenceChangeListe } public String getUrl() { - url = "http://" + prefs.getString("server", defaultUrl); + url = "http://" + prefs.getString("server", getString(R.string.defaultURL)); return url; } -- libgit2 0.22.2