Commit bf9662d775a9f16a7a525fcebf42d8e31fba3e81

Authored by Imanol-Mikel Barba Sabariego
1 parent 79028e92

--no commit message

gen/com/upc/pbe/upcnews/R.java
@@ -8,6 +8,10 @@ @@ -8,6 +8,10 @@
8 package com.upc.pbe.upcnews; 8 package com.upc.pbe.upcnews;
9 9
10 public final class R { 10 public final class R {
  11 + public static final class array {
  12 + public static final int qualityNames=0x7f080000;
  13 + public static final int qualityValues=0x7f080001;
  14 + }
11 public static final class attr { 15 public static final class attr {
12 } 16 }
13 public static final class color { 17 public static final class color {
@@ -38,20 +42,20 @@ public final class R { @@ -38,20 +42,20 @@ public final class R {
38 public static final int startbuttontoggle=0x7f020007; 42 public static final int startbuttontoggle=0x7f020007;
39 } 43 }
40 public static final class id { 44 public static final class id {
41 - public static final int LinearLayout1=0x7f0a0001;  
42 - public static final int RelativeLayout1=0x7f0a0006;  
43 - public static final int button=0x7f0a0007;  
44 - public static final int itemhelp=0x7f0a000d;  
45 - public static final int itemprefs=0x7f0a000c;  
46 - public static final int listView1=0x7f0a0003;  
47 - public static final int menu_settings=0x7f0a000b;  
48 - public static final int rowTextView=0x7f0a000a;  
49 - public static final int textView1=0x7f0a0004;  
50 - public static final int textView2=0x7f0a0005;  
51 - public static final int textViewTitle=0x7f0a0002;  
52 - public static final int textViewUrl=0x7f0a0009;  
53 - public static final int textViewXml=0x7f0a0008;  
54 - public static final int videoView1=0x7f0a0000; 45 + public static final int LinearLayout1=0x7f0b0001;
  46 + public static final int RelativeLayout1=0x7f0b0006;
  47 + public static final int button=0x7f0b0007;
  48 + public static final int itemhelp=0x7f0b000d;
  49 + public static final int itemprefs=0x7f0b000c;
  50 + public static final int listView1=0x7f0b0003;
  51 + public static final int menu_settings=0x7f0b000b;
  52 + public static final int rowTextView=0x7f0b000a;
  53 + public static final int textView1=0x7f0b0004;
  54 + public static final int textView2=0x7f0b0005;
  55 + public static final int textViewTitle=0x7f0b0002;
  56 + public static final int textViewUrl=0x7f0b0009;
  57 + public static final int textViewXml=0x7f0b0008;
  58 + public static final int videoView1=0x7f0b0000;
55 } 59 }
56 public static final class layout { 60 public static final class layout {
57 public static final int activity_video=0x7f030000; 61 public static final int activity_video=0x7f030000;
@@ -61,14 +65,15 @@ public final class R { @@ -61,14 +65,15 @@ public final class R {
61 public static final int rowlayout=0x7f030004; 65 public static final int rowlayout=0x7f030004;
62 } 66 }
63 public static final class menu { 67 public static final class menu {
64 - public static final int activity_main=0x7f090000;  
65 - public static final int activity_video=0x7f090001;  
66 - public static final int menu=0x7f090002; 68 + public static final int activity_main=0x7f0a0000;
  69 + public static final int activity_video=0x7f0a0001;
  70 + public static final int menu=0x7f0a0002;
67 } 71 }
68 public static final class string { 72 public static final class string {
69 public static final int app_name=0x7f070000; 73 public static final int app_name=0x7f070000;
70 public static final int button=0x7f07000c; 74 public static final int button=0x7f07000c;
71 public static final int button1=0x7f07000d; 75 public static final int button1=0x7f07000d;
  76 + public static final int defaultQuality=0x7f070016;
72 public static final int defaultURL=0x7f070013; 77 public static final int defaultURL=0x7f070013;
73 public static final int desc=0x7f070009; 78 public static final int desc=0x7f070009;
74 public static final int descarregar=0x7f070003; 79 public static final int descarregar=0x7f070003;
@@ -80,6 +85,8 @@ public final class R { @@ -80,6 +85,8 @@ public final class R {
80 public static final int hint=0x7f070004; 85 public static final int hint=0x7f070004;
81 public static final int menu_settings=0x7f070001; 86 public static final int menu_settings=0x7f070001;
82 public static final int prefs=0x7f070007; 87 public static final int prefs=0x7f070007;
  88 + public static final int qual=0x7f070014;
  89 + public static final int qual_hint=0x7f070015;
83 public static final int startbuttondescription=0x7f07000f; 90 public static final int startbuttondescription=0x7f07000f;
84 public static final int title=0x7f07000e; 91 public static final int title=0x7f07000e;
85 public static final int title_activity_main=0x7f070002; 92 public static final int title_activity_main=0x7f070002;
@@ -88,8 +95,8 @@ public final class R { @@ -88,8 +95,8 @@ public final class R {
88 public static final int urlhint=0x7f070006; 95 public static final int urlhint=0x7f070006;
89 } 96 }
90 public static final class style { 97 public static final class style {
91 - public static final int AppTheme=0x7f080000;  
92 - public static final int leBoldText=0x7f080001; 98 + public static final int AppTheme=0x7f090000;
  99 + public static final int leBoldText=0x7f090001;
93 } 100 }
94 public static final class xml { 101 public static final class xml {
95 public static final int prefs=0x7f040000; 102 public static final int prefs=0x7f040000;
res/values/strings.xml
@@ -5,8 +5,8 @@ @@ -5,8 +5,8 @@
5 <string name="title_activity_main">UPC NEWS</string> 5 <string name="title_activity_main">UPC NEWS</string>
6 <string name="descarregar">Start Application</string> 6 <string name="descarregar">Start Application</string>
7 <string name="hint">Touch to Start.</string> 7 <string name="hint">Touch to Start.</string>
8 - <string name="url">Server URL</string>  
9 - <string name="urlhint">Set the server route (without http://)</string> 8 + <string name="url">URL del Servidor</string>
  9 + <string name="urlhint">Direcció URL del servidor a connectarse (sense http://)</string>
10 <string name="prefs">Preferences</string> 10 <string name="prefs">Preferences</string>
11 <string name="help">Help</string> 11 <string name="help">Help</string>
12 <string name="desc">Play</string> 12 <string name="desc">Play</string>
@@ -27,8 +27,8 @@ @@ -27,8 +27,8 @@
27 siusplau dirigeixi\'s a la Universitat o escrigui un mail als desenvolupadors.\n\n Necessària la instal·lació 27 siusplau dirigeixi\'s a la Universitat o escrigui un mail als desenvolupadors.\n\n Necessària la instal·lació
28 de la llibreria Vitamio per reproduïr arxius .ts</string> 28 de la llibreria Vitamio per reproduïr arxius .ts</string>
29 <string name="defaultURL">imanolbarba.myftp.biz/PBE</string> 29 <string name="defaultURL">imanolbarba.myftp.biz/PBE</string>
30 - <string name="qual">Quality</string>  
31 - <string name="qual_hint">Which is the default quality?</string> 30 + <string name="qual">Qualitat de reproducció</string>
  31 + <string name="qual_hint">Qualitat inicial de reproducció</string>
32 <string-array name="qualityNames"> 32 <string-array name="qualityNames">
33 <item >High Quality</item> 33 <item >High Quality</item>
34 <item >Medium Quality</item> 34 <item >Medium Quality</item>
@@ -39,5 +39,6 @@ @@ -39,5 +39,6 @@
39 <item >1</item> 39 <item >1</item>
40 <item >2</item> 40 <item >2</item>
41 </string-array> 41 </string-array>
  42 + <string name="defaultQuality">0</string>
42 43
43 </resources> 44 </resources>
44 \ No newline at end of file 45 \ No newline at end of file
res/xml/prefs.xml
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" > 2 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
3 <EditTextPreference android:key="server" android:title="@string/url" android:summary="@string/urlhint" android:defaultValue="@string/defaultURL"/> 3 <EditTextPreference android:key="server" android:title="@string/url" android:summary="@string/urlhint" android:defaultValue="@string/defaultURL"/>
4 - <ListPreference android:title="@string/qual" android:summary="@string/qual_hint" android:key="quality" android:entries="@array/qualityNames" android:entryValues="@array/qualityValues"/> 4 + <ListPreference android:title="@string/qual" android:summary="@string/qual_hint" android:key="quality" android:entries="@array/qualityNames" android:entryValues="@array/qualityValues" android:defaultValue="@string/defaultQuality"/>
5 </PreferenceScreen> 5 </PreferenceScreen>
6 \ No newline at end of file 6 \ No newline at end of file
src/com/upc/pbe/upcnews/MainActivity.java
@@ -105,7 +105,6 @@ public class MainActivity extends Activity implements OnClickListener { @@ -105,7 +105,6 @@ public class MainActivity extends Activity implements OnClickListener {
105 * Que cojones pasa con los codecs -- Imanol 105 * Que cojones pasa con los codecs -- Imanol
106 * Descarga en segundo plano (Mejora dificil) 106 * Descarga en segundo plano (Mejora dificil)
107 * Lentitud descarga -- Todos (este miercoles) 107 * Lentitud descarga -- Todos (este miercoles)
108 - * Añadir selector de starting quality en preferencias (lo dijimos en el reqspec!)  
109 * Poner la defaultURL al server de PBE 108 * Poner la defaultURL al server de PBE
110 * Unificar la lengua de todo (WERT STYLE FUCK YES) y que cada uno documente minimamente su codigo 109 * Unificar la lengua de todo (WERT STYLE FUCK YES) y que cada uno documente minimamente su codigo
111 * Borrar esta puta mierda 110 * Borrar esta puta mierda