defaultURL

Imanol-Mikel Barba Sabariego
1 parent 9e241d08
Showing 5 changed files with 5 additions and 7 deletions
gen/com/upc/pbe/upcnews/R.java
res/layout/main_activity.xml
res/values/strings.xml
res/xml/prefs.xml
src/com/upc/pbe/upcnews/UpcApp.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;
@@ -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" />
 </RelativeLayout>
 \ No newline at end of file
@@ -18,7 +18,6 @@
     <string name="startbuttondescription">Click to Start</string>
     <string name="hello_world">Hello world!</string>
     <string name="title_activity_video">VideoActivity</string>
-    <string name="defaultURL">http://imanolbarba.myftp.biz/PBE</string>
     <string name="helpText"> 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</string>
+    <string name="defaultURL">imanolbarba.myftp.biz/PBE</string>
 </resources>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
-    <EditTextPreference android:key="server" android:title="@string/url" android:summary="@string/urlhint"/>
+    <EditTextPreference android:key="server" android:title="@string/url" android:summary="@string/urlhint" android:defaultValue="@string/defaultURL"/>
     </PreferenceScreen>
 \ No newline at end of file
@@ -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;
 	}