Commit a3a97c8f8bb89f48652974e897644cdb9b7efc66

Authored by Imanol-Mikel Barba Sabariego
1 parent 445c1e85

Un parell d'arreglos al xml del MainActivity

gen/com/upc/pbe/upcnews/R.java
@@ -20,7 +20,7 @@ public final class R { @@ -20,7 +20,7 @@ public final class R {
20 public static final int ImageView01=0x7f08000b; 20 public static final int ImageView01=0x7f08000b;
21 public static final int ImageView1=0x7f08000a; 21 public static final int ImageView1=0x7f08000a;
22 public static final int LinearLayout1=0x7f080000; 22 public static final int LinearLayout1=0x7f080000;
23 - public static final int button=0x7f08000d; 23 + public static final int button=0x7f08000e;
24 public static final int button1=0x7f080002; 24 public static final int button1=0x7f080002;
25 public static final int button2=0x7f080003; 25 public static final int button2=0x7f080003;
26 public static final int button3=0x7f080004; 26 public static final int button3=0x7f080004;
@@ -33,7 +33,7 @@ public final class R { @@ -33,7 +33,7 @@ public final class R {
33 public static final int textView2=0x7f080008; 33 public static final int textView2=0x7f080008;
34 public static final int textViewRoute=0x7f08000c; 34 public static final int textViewRoute=0x7f08000c;
35 public static final int textViewTitle=0x7f080001; 35 public static final int textViewTitle=0x7f080001;
36 - public static final int textViewXml=0x7f08000e; 36 + public static final int textViewXml=0x7f08000d;
37 } 37 }
38 public static final class layout { 38 public static final class layout {
39 public static final int dirs=0x7f030000; 39 public static final int dirs=0x7f030000;
@@ -54,6 +54,7 @@ public final class R { @@ -54,6 +54,7 @@ public final class R {
54 public static final int directoris=0x7f05000b; 54 public static final int directoris=0x7f05000b;
55 public static final int help=0x7f050008; 55 public static final int help=0x7f050008;
56 public static final int hint=0x7f050004; 56 public static final int hint=0x7f050004;
  57 + public static final int logodescription=0x7f05000f;
57 public static final int menu_settings=0x7f050001; 58 public static final int menu_settings=0x7f050001;
58 public static final int prefs=0x7f050007; 59 public static final int prefs=0x7f050007;
59 public static final int title=0x7f05000e; 60 public static final int title=0x7f05000e;
res/layout/main_activity.xml
@@ -14,21 +14,23 @@ @@ -14,21 +14,23 @@
14 android:layout_y="22dp" 14 android:layout_y="22dp"
15 android:text="@string/app_name" 15 android:text="@string/app_name"
16 android:textAppearance="?android:attr/textAppearanceLarge" /> 16 android:textAppearance="?android:attr/textAppearanceLarge" />
17 - 17 +
18 <ImageView 18 <ImageView
19 android:id="@+id/ImageView1" 19 android:id="@+id/ImageView1"
20 android:layout_width="wrap_content" 20 android:layout_width="wrap_content"
21 android:layout_height="wrap_content" 21 android:layout_height="wrap_content"
22 android:layout_x="28dp" 22 android:layout_x="28dp"
23 android:layout_y="12dp" 23 android:layout_y="12dp"
  24 + android:contentDescription="@string/logodescription"
24 android:src="@drawable/ic_launcher" /> 25 android:src="@drawable/ic_launcher" />
25 - 26 +
26 <ImageView 27 <ImageView
27 android:id="@+id/ImageView01" 28 android:id="@+id/ImageView01"
28 android:layout_width="wrap_content" 29 android:layout_width="wrap_content"
29 android:layout_height="wrap_content" 30 android:layout_height="wrap_content"
30 android:layout_x="223dp" 31 android:layout_x="223dp"
31 android:layout_y="14dp" 32 android:layout_y="14dp"
  33 + android:contentDescription="@string/logodescription"
32 android:src="@drawable/ic_launcher" /> 34 android:src="@drawable/ic_launcher" />
33 35
34 <TextView 36 <TextView
@@ -39,23 +41,23 @@ @@ -39,23 +41,23 @@
39 android:layout_y="306dp" 41 android:layout_y="306dp"
40 android:textSize="@android:dimen/thumbnail_height" /> 42 android:textSize="@android:dimen/thumbnail_height" />
41 43
42 - <Button  
43 - android:id="@+id/button"  
44 - android:layout_width="258dp"  
45 - android:layout_height="wrap_content"  
46 - android:layout_x="26dp"  
47 - android:layout_y="333dp"  
48 - android:text="@string/descarregar" />  
49 -  
50 <TextView 44 <TextView
51 android:id="@+id/textViewXml" 45 android:id="@+id/textViewXml"
52 android:layout_width="wrap_content" 46 android:layout_width="wrap_content"
53 android:layout_height="wrap_content" 47 android:layout_height="wrap_content"
54 - android:layout_x="18dp" 48 + android:layout_x="24dp"
55 android:layout_y="384dp" 49 android:layout_y="384dp"
56 android:gravity="clip_vertical" 50 android:gravity="clip_vertical"
57 android:hint="@string/hint" 51 android:hint="@string/hint"
58 android:scrollbarStyle="insideInset" 52 android:scrollbarStyle="insideInset"
59 android:scrollbars="vertical" /> 53 android:scrollbars="vertical" />
60 54
  55 + <Button
  56 + android:id="@+id/button"
  57 + android:layout_width="258dp"
  58 + android:layout_height="wrap_content"
  59 + android:layout_x="15dp"
  60 + android:layout_y="334dp"
  61 + android:text="@string/descarregar" />
  62 +
61 </AbsoluteLayout> 63 </AbsoluteLayout>
62 \ No newline at end of file 64 \ No newline at end of file
res/values/strings.xml
1 <resources> 1 <resources>
2 2
3 - <string name="app_name">UPC_NEWS</string> 3 + <string name="app_name">UPC NEWS</string>
4 <string name="menu_settings">Settings</string> 4 <string name="menu_settings">Settings</string>
5 <string name="title_activity_main">MainActivity</string> 5 <string name="title_activity_main">MainActivity</string>
6 <string name="descarregar">Start Application</string> 6 <string name="descarregar">Start Application</string>
7 - <string name="hint">Click to Start button or click Settins for Help</string> 7 + <string name="hint">Click to Start or go to Settings for Help</string>
8 <string name="url">URL server</string> 8 <string name="url">URL server</string>
9 <string name="urlhint">Set the route from the server (without http://)</string> 9 <string name="urlhint">Set the route from the server (without http://)</string>
10 <string name="prefs">Preferences</string> 10 <string name="prefs">Preferences</string>
@@ -15,5 +15,6 @@ @@ -15,5 +15,6 @@
15 <string name="button">Button</string> 15 <string name="button">Button</string>
16 <string name="button1">Play</string> 16 <string name="button1">Play</string>
17 <string name="title">Directories found:</string> 17 <string name="title">Directories found:</string>
  18 + <string name="logodescription">Logo Image</string>
18 19
19 </resources> 20 </resources>
20 \ No newline at end of file 21 \ No newline at end of file