Commit dcc8ad47baebadfe38adbf882f5c6ddf6395909b
1 parent
befa8dc3
--no commit message
Showing
4 changed files
with
109 additions
and
101 deletions
gen/com/upc/pbe/upcnews/R.java
1 | -/* AUTO-GENERATED FILE. DO NOT MODIFY. | ||
2 | - * | ||
3 | - * This class was automatically generated by the | ||
4 | - * aapt tool from the resource data it found. It | ||
5 | - * should not be modified by hand. | ||
6 | - */ | ||
7 | - | ||
8 | -package com.upc.pbe.upcnews; | ||
9 | - | ||
10 | -public final class R { | ||
11 | - public static final class attr { | ||
12 | - } | ||
13 | - public static final class color { | ||
14 | - public static final int Black=0x7f050002; | ||
15 | - public static final int Blue=0x7f050004; | ||
16 | - public static final int BlueAndroid=0x7f050005; | ||
17 | - public static final int Gay=0x7f050007; | ||
18 | - public static final int Gray=0x7f05000a; | ||
19 | - public static final int Green=0x7f050009; | ||
20 | - public static final int Orange=0x7f050003; | ||
21 | - public static final int Red=0x7f050008; | ||
22 | - public static final int White=0x7f050006; | ||
23 | - public static final int Whyte_POwaH=0x7f050001; | ||
24 | - public static final int backgroundmain=0x7f050000; | ||
25 | - } | ||
26 | - public static final class dimen { | ||
27 | - public static final int TitleSize=0x7f060000; | ||
28 | - public static final int lesize=0x7f060001; | ||
29 | - } | ||
30 | - public static final class drawable { | ||
31 | - public static final int ic_action_search=0x7f020000; | ||
32 | - public static final int ic_launcher=0x7f020001; | ||
33 | - public static final int ic_ledarklogo=0x7f020002; | ||
34 | - public static final int ic_menu_name=0x7f020003; | ||
35 | - public static final int ic_startbutton=0x7f020004; | ||
36 | - public static final int selectedonlist=0x7f020005; | ||
37 | - public static final int selectedonlist2=0x7f020006; | ||
38 | - public static final int startbuttontoggle=0x7f020007; | ||
39 | - } | ||
40 | - 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; | ||
55 | - } | ||
56 | - public static final class layout { | ||
57 | - public static final int activity_video=0x7f030000; | ||
58 | - public static final int dirs=0x7f030001; | ||
59 | - public static final int help=0x7f030002; | ||
60 | - public static final int main_activity=0x7f030003; | ||
61 | - public static final int rowlayout=0x7f030004; | ||
62 | - } | ||
63 | - 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; | ||
67 | - } | ||
68 | - public static final class string { | ||
69 | - public static final int app_name=0x7f070000; | ||
70 | - public static final int button=0x7f07000c; | ||
71 | - public static final int button1=0x7f07000d; | ||
72 | - public static final int defaultURL=0x7f070012; | ||
73 | - public static final int desc=0x7f070009; | ||
74 | - public static final int descarregar=0x7f070003; | ||
75 | - public static final int dir=0x7f07000a; | ||
76 | - public static final int directoris=0x7f07000b; | ||
77 | - public static final int hello_world=0x7f070010; | ||
78 | - public static final int help=0x7f070008; | ||
79 | - public static final int hint=0x7f070004; | ||
80 | - public static final int menu_settings=0x7f070001; | ||
81 | - public static final int prefs=0x7f070007; | ||
82 | - public static final int startbuttondescription=0x7f07000f; | ||
83 | - public static final int title=0x7f07000e; | ||
84 | - public static final int title_activity_main=0x7f070002; | ||
85 | - public static final int title_activity_video=0x7f070011; | ||
86 | - public static final int url=0x7f070005; | ||
87 | - public static final int urlhint=0x7f070006; | ||
88 | - } | ||
89 | - public static final class style { | ||
90 | - public static final int AppTheme=0x7f080000; | ||
91 | - public static final int leBoldText=0x7f080001; | ||
92 | - } | ||
93 | - public static final class xml { | ||
94 | - public static final int prefs=0x7f040000; | ||
95 | - } | ||
96 | -} | 1 | +/* AUTO-GENERATED FILE. DO NOT MODIFY. |
2 | + * | ||
3 | + * This class was automatically generated by the | ||
4 | + * aapt tool from the resource data it found. It | ||
5 | + * should not be modified by hand. | ||
6 | + */ | ||
7 | + | ||
8 | +package com.upc.pbe.upcnews; | ||
9 | + | ||
10 | +public final class R { | ||
11 | + public static final class attr { | ||
12 | + } | ||
13 | + public static final class color { | ||
14 | + public static final int Black=0x7f050002; | ||
15 | + public static final int Blue=0x7f050004; | ||
16 | + public static final int BlueAndroid=0x7f050005; | ||
17 | + public static final int Gay=0x7f050007; | ||
18 | + public static final int Gray=0x7f05000a; | ||
19 | + public static final int Green=0x7f050009; | ||
20 | + public static final int Orange=0x7f050003; | ||
21 | + public static final int Red=0x7f050008; | ||
22 | + public static final int White=0x7f050006; | ||
23 | + public static final int Whyte_POwaH=0x7f050001; | ||
24 | + public static final int backgroundmain=0x7f050000; | ||
25 | + } | ||
26 | + public static final class dimen { | ||
27 | + public static final int TitleSize=0x7f060000; | ||
28 | + public static final int lesize=0x7f060001; | ||
29 | + } | ||
30 | + public static final class drawable { | ||
31 | + public static final int ic_action_search=0x7f020000; | ||
32 | + public static final int ic_launcher=0x7f020001; | ||
33 | + public static final int ic_ledarklogo=0x7f020002; | ||
34 | + public static final int ic_menu_name=0x7f020003; | ||
35 | + public static final int ic_startbutton=0x7f020004; | ||
36 | + public static final int selectedonlist=0x7f020005; | ||
37 | + public static final int selectedonlist2=0x7f020006; | ||
38 | + public static final int startbuttontoggle=0x7f020007; | ||
39 | + } | ||
40 | + 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; | ||
55 | + } | ||
56 | + public static final class layout { | ||
57 | + public static final int activity_video=0x7f030000; | ||
58 | + public static final int dirs=0x7f030001; | ||
59 | + public static final int help=0x7f030002; | ||
60 | + public static final int main_activity=0x7f030003; | ||
61 | + public static final int rowlayout=0x7f030004; | ||
62 | + } | ||
63 | + 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; | ||
67 | + } | ||
68 | + public static final class string { | ||
69 | + public static final int app_name=0x7f070000; | ||
70 | + public static final int button=0x7f07000c; | ||
71 | + public static final int button1=0x7f07000d; | ||
72 | + public static final int defaultURL=0x7f070012; | ||
73 | + public static final int desc=0x7f070009; | ||
74 | + public static final int descarregar=0x7f070003; | ||
75 | + public static final int dir=0x7f07000a; | ||
76 | + public static final int directoris=0x7f07000b; | ||
77 | + public static final int hello_world=0x7f070010; | ||
78 | + public static final int help=0x7f070008; | ||
79 | + public static final int helpText=0x7f070013; | ||
80 | + public static final int hint=0x7f070004; | ||
81 | + public static final int menu_settings=0x7f070001; | ||
82 | + public static final int prefs=0x7f070007; | ||
83 | + public static final int startbuttondescription=0x7f07000f; | ||
84 | + public static final int title=0x7f07000e; | ||
85 | + public static final int title_activity_main=0x7f070002; | ||
86 | + public static final int title_activity_video=0x7f070011; | ||
87 | + public static final int url=0x7f070005; | ||
88 | + public static final int urlhint=0x7f070006; | ||
89 | + } | ||
90 | + public static final class style { | ||
91 | + public static final int AppTheme=0x7f080000; | ||
92 | + public static final int leBoldText=0x7f080001; | ||
93 | + } | ||
94 | + public static final class xml { | ||
95 | + public static final int prefs=0x7f040000; | ||
96 | + } | ||
97 | +} |
res/layout/help.xml
@@ -22,7 +22,9 @@ | @@ -22,7 +22,9 @@ | ||
22 | <TextView | 22 | <TextView |
23 | android:id="@+id/textView2" | 23 | android:id="@+id/textView2" |
24 | android:layout_width="match_parent" | 24 | android:layout_width="match_parent" |
25 | - android:layout_height="0dp" /> | 25 | + android:layout_height="0dp" |
26 | + android:text="@string/helpText" /> | ||
27 | + | ||
26 | </ScrollView> | 28 | </ScrollView> |
27 | 29 | ||
28 | </LinearLayout> | 30 | </LinearLayout> |
29 | \ No newline at end of file | 31 | \ No newline at end of file |
res/values/strings.xml
@@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
8 | <string name="url">Server URL</string> | 8 | <string name="url">Server URL</string> |
9 | <string name="urlhint">Set the server route (without http://)</string> | 9 | <string name="urlhint">Set the server route (without 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> |
13 | <string name="dir">Directory</string> | 13 | <string name="dir">Directory</string> |
14 | <string name="directoris">Directoris</string> | 14 | <string name="directoris">Directoris</string> |
@@ -19,5 +19,13 @@ | @@ -19,5 +19,13 @@ | ||
19 | <string name="hello_world">Hello world!</string> | 19 | <string name="hello_world">Hello world!</string> |
20 | <string name="title_activity_video">VideoActivity</string> | 20 | <string name="title_activity_video">VideoActivity</string> |
21 | <string name="defaultURL">http://imanolbarba.myftp.biz/PBE</string> | 21 | <string name="defaultURL">http://imanolbarba.myftp.biz/PBE</string> |
22 | + <string name="helpText"> UPC News 0.7 Alpha rev. 148\n \u00A9 Copyright Universitat Politècnica de Catalunya\n 2012. Tots els | ||
23 | + drets reservats.\n\n Membres del grup de programadors:\n Marc Siquier \n Albert Quiroga\n Imanol barba | ||
24 | + \n Marius Oltean\n\n Professor: Josep Pegueroles\n Assignatura: Projecte Bàsic de Enginyeria\n\n Aplicació dissenyada | ||
25 | + per Android 2.3.3\n Gingerbread\n\n La App permet connectarse a servidors\n Apache i reproduïr arxius .m3u8 | ||
26 | + emulant\n estàndard HTTP Live Streaming. Documentació\n detallada del desenvolupament disponible als\n | ||
27 | + documents de Requirements Specification, Project\n Plan i Final Report. \n\n Per reportar errors, | ||
28 | + siusplau\n escrigui a la Universitat o escrigui un mail als\n desenvolupadors.\n\n Necessària la instal·lació | ||
29 | + de la llibreria Vitamio\n per reproduïr arxius .ts</string> | ||
22 | 30 | ||
23 | </resources> | 31 | </resources> |
24 | \ No newline at end of file | 32 | \ No newline at end of file |
src/com/upc/pbe/upcnews/Help.java
@@ -8,14 +8,11 @@ import android.widget.TextView; | @@ -8,14 +8,11 @@ import android.widget.TextView; | ||
8 | public class Help extends Activity{ | 8 | public class Help extends Activity{ |
9 | 9 | ||
10 | final static String TAG = "Help"; | 10 | final static String TAG = "Help"; |
11 | - final static String HELP = "Help, I need somebody, Help, not just anybody, Help, you know I need someone, help. "; | ||
12 | 11 | ||
13 | public void onCreate(Bundle savedInstanceState) { | 12 | public void onCreate(Bundle savedInstanceState) { |
14 | Log.d(TAG, "onCreated"); | 13 | Log.d(TAG, "onCreated"); |
15 | super.onCreate(savedInstanceState); | 14 | super.onCreate(savedInstanceState); |
16 | setContentView(R.layout.help); | 15 | setContentView(R.layout.help); |
17 | - TextView text = (TextView) findViewById(R.id.textView2); | ||
18 | - text.setText(HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP + HELP); | ||
19 | } | 16 | } |
20 | public void onStop(){ | 17 | public void onStop(){ |
21 | Log.d(TAG, "onStoped"); | 18 | Log.d(TAG, "onStoped"); |