Imanol-Mikel Barba Sabariego / upcnews · Commits

Commit c3a6401f36818be25a05cc382ccfaac63f2af8de

Authored by Imanol-Mikel Barba Sabariego
1 parent 827f4218

--no commit message

Inline Side-by-side
Showing 18 changed files with 31 additions and 16 deletions
AndroidManifest.xml
  View file @c3a6401
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 </activity> 34 </activity>
35 <activity android:name=".Help" > 35 <activity android:name=".Help" >
36 </activity> 36 </activity>
37 - <activity android:name=".Directoris" > 37 + <activity android:name=".Directoris" >
38 </activity> 38 </activity>
39 <activity android:name=".VideoActivity" > 39 <activity android:name=".VideoActivity" >
40 </activity> 40 </activity>
gen/com/upc/pbe/upcnews/R.java
  View file @c3a6401
@@ -11,10 +11,12 @@ public final class R { @@ -11,10 +11,12 @@ public final class R {
11 public static final class attr { 11 public static final class attr {
12 } 12 }
13 public static final class color { 13 public static final class color {
  14 + public static final int Whyte_POwaH=0x7f050001;
14 public static final int backgroundmain=0x7f050000; 15 public static final int backgroundmain=0x7f050000;
15 } 16 }
16 public static final class dimen { 17 public static final class dimen {
17 public static final int TitleSize=0x7f060000; 18 public static final int TitleSize=0x7f060000;
  19 + public static final int lesize=0x7f060001;
18 } 20 }
19 public static final class drawable { 21 public static final class drawable {
20 public static final int ic_action_search=0x7f020000; 22 public static final int ic_action_search=0x7f020000;
res/drawable-hdpi/ic_ledarklogo.png
View file @c3a6401

6.5 KB | W: | H:

136 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
res/drawable-hdpi/ic_startbutton.png
View file @c3a6401

8.24 KB | W: | H:

189 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
res/drawable-ldpi/ic_ledarklogo.png
View file @c3a6401

2.37 KB | W: | H:

136 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
res/drawable-ldpi/ic_startbutton.png
View file @c3a6401

2.77 KB | W: | H:

189 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
res/drawable-mdpi/ic_ledarklogo.png
View file @c3a6401

3.61 KB | W: | H:

136 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
res/drawable-mdpi/ic_startbutton.png
View file @c3a6401

4.39 KB | W: | H:

189 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
res/drawable-xhdpi/ic_ledarklogo.png
View file @c3a6401

9.46 KB | W: | H:

136 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
res/drawable-xhdpi/ic_startbutton.png
View file @c3a6401

12.7 KB | W: | H:

189 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
res/layout/dirs.xml
  View file @c3a6401
@@ -3,23 +3,26 @@ @@ -3,23 +3,26 @@
3 android:id="@+id/LinearLayout1" 3 android:id="@+id/LinearLayout1"
4 android:layout_width="match_parent" 4 android:layout_width="match_parent"
5 android:layout_height="match_parent" 5 android:layout_height="match_parent"
  6 + android:background="@color/backgroundmain"
6 android:gravity="center_horizontal" 7 android:gravity="center_horizontal"
7 android:orientation="vertical" > 8 android:orientation="vertical" >
8 9
9 <!-- Vista en llista --> 10 <!-- Vista en llista -->
10 - 11 +
11 <TextView 12 <TextView
12 android:id="@+id/textViewTitle" 13 android:id="@+id/textViewTitle"
13 android:layout_width="wrap_content" 14 android:layout_width="wrap_content"
14 android:layout_height="wrap_content" 15 android:layout_height="wrap_content"
15 android:layout_marginLeft="14dp" 16 android:layout_marginLeft="14dp"
16 android:text="@string/title" 17 android:text="@string/title"
17 - android:textAppearance="?android:attr/textAppearanceMedium" />  
18 - 18 + android:textAppearance="?android:attr/textAppearanceMedium"
  19 + android:textColor="@color/Whyte_POwaH" />
  20 +
19 <ListView 21 <ListView
20 android:id="@+id/listView1" 22 android:id="@+id/listView1"
21 android:layout_width="match_parent" 23 android:layout_width="match_parent"
22 android:layout_height="wrap_content" 24 android:layout_height="wrap_content"
  25 + android:background="@color/backgroundmain"
23 android:clickable="true" 26 android:clickable="true"
24 android:visibility="visible" > 27 android:visibility="visible" >
25 28
res/layout/main_activity.xml
  View file @c3a6401
@@ -18,7 +18,10 @@ @@ -18,7 +18,10 @@
18 android:background="@drawable/startbuttontoggle" 18 android:background="@drawable/startbuttontoggle"
19 android:contentDescription="@string/startbuttondescription" 19 android:contentDescription="@string/startbuttondescription"
20 android:focusable="false" 20 android:focusable="false"
21 - android:focusableInTouchMode="false" /> 21 + android:focusableInTouchMode="false"
  22 + android:maxHeight="@dimen/lesize"
  23 + android:maxWidth="@dimen/lesize"
  24 + android:scaleType="fitCenter" />
22 25
23 <TextView 26 <TextView
24 android:id="@+id/textViewXml" 27 android:id="@+id/textViewXml"
@@ -30,6 +33,8 @@ @@ -30,6 +33,8 @@
30 android:gravity="clip_vertical" 33 android:gravity="clip_vertical"
31 android:hint="@string/hint" 34 android:hint="@string/hint"
32 android:scrollbarStyle="insideInset" 35 android:scrollbarStyle="insideInset"
33 - android:scrollbars="vertical" /> 36 + android:scrollbars="vertical"
  37 + android:textColorHint="@color/Whyte_POwaH"
  38 + android:textStyle="bold" />
34 39
35 </RelativeLayout> 40 </RelativeLayout>
36 \ No newline at end of file 41 \ No newline at end of file
res/layout/rowlayout.xml
  View file @c3a6401
1 -<TextView xmlns:android="http://schemas.android.com/apk/res/android"  
2 - android:id="@+id/rowTextView"  
3 - android:layout_width="fill_parent"  
4 - android:layout_height="wrap_content"  
5 - android:padding="10dp"  
6 - android:textSize="16sp" > 1 +<TextView xmlns:android="http://schemas.android.com/apk/res/android"
  2 + android:id="@+id/rowTextView"
  3 + android:layout_width="fill_parent"
  4 + android:layout_height="wrap_content"
  5 + android:background="@color/backgroundmain"
  6 + android:padding="10dp"
  7 + android:textColor="@color/Whyte_POwaH"
  8 + android:textSize="16sp" >
  9 +
7 </TextView> 10 </TextView>
8 \ No newline at end of file 11 \ No newline at end of file
res/values/colors.xml
  View file @c3a6401
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <resources> 2 <resources>
3 <color name="backgroundmain">#000000</color> 3 <color name="backgroundmain">#000000</color>
  4 + <color name="Whyte_POwaH">#FFFFFF</color>
4 5
5 </resources> 6 </resources>
6 \ No newline at end of file 7 \ No newline at end of file
res/values/dimens.xml
  View file @c3a6401
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <resources> 2 <resources>
3 <dimen name="TitleSize">50px</dimen> 3 <dimen name="TitleSize">50px</dimen>
  4 + <dimen name="lesize">256dip</dimen>
4 </resources> 5 </resources>
res/values/styles.xml
  View file @c3a6401
1 <resources> 1 <resources>
2 2
3 - <style name="AppTheme" parent="android:Theme.Light" /> 3 + <style name="AppTheme" parent="android:Theme.Light.NoTitleBar" />
4 4
5 </resources> 5 </resources>
6 \ No newline at end of file 6 \ No newline at end of file
src/com/upc/pbe/upcnews/Directoris.java
  View file @c3a6401
@@ -113,7 +113,7 @@ public class Directoris extends Activity implements OnItemClickListener @@ -113,7 +113,7 @@ public class Directoris extends Activity implements OnItemClickListener
113 ArrayList<ParentList> m3u8parsed = p.parseFile(playlist); 113 ArrayList<ParentList> m3u8parsed = p.parseFile(playlist);
114 Log.d(TAG, "parsing completed"); 114 Log.d(TAG, "parsing completed");
115 HLS h = new HLS(m3u8parsed); 115 HLS h = new HLS(m3u8parsed);
116 - h.start(); 116 + // h.start();
117 117
118 } 118 }
119 catch (ErrorException e) 119 catch (ErrorException e)
src/com/upc/pbe/upcnews/HLS.java
  View file @c3a6401
@@ -23,10 +23,10 @@ public class HLS { @@ -23,10 +23,10 @@ public class HLS {
23 for(video = 0; video < videos.size(); video++) 23 for(video = 0; video < videos.size(); video++)
24 { 24 {
25 ArrayList<Video> qualities = videos.get(video).getLists(); 25 ArrayList<Video> qualities = videos.get(video).getLists();
26 - while(i > videos.get(quality).getLists()) 26 + /*while(i > videos.get(quality).getLists())
27 { 27 {
28 Segment seg = videos.get(video).getLists().get(quality).getSegments().get(i); 28 Segment seg = videos.get(video).getLists().get(quality).getSegments().get(i);
29 - } 29 + }*/
30 } 30 }
31 } 31 }
32 } 32 }