Imanol-Mikel Barba Sabariego / upcnews · Commits

Commit 054f768d229aed5501dd808d1867a075e71d3117

Authored by Imanol-Mikel Barba Sabariego
1 parent e5f7a1a2

--no commit message

Inline Side-by-side
Showing 4 changed files with 13 additions and 126 deletions
gen/com/upc/pbe/upcnews/R.java deleted
View file @e5f7a1a
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 backgroundmain=0x7f050000;  
15 - }  
16 - public static final class dimen {  
17 - public static final int TitleSize=0x7f060000;  
18 - }  
19 - public static final class drawable {  
20 - public static final int ic_action_search=0x7f020000;  
21 - public static final int ic_launcher=0x7f020001;  
22 - public static final int ic_ledarklogo=0x7f020002;  
23 - public static final int ic_menu_name=0x7f020003;  
24 - public static final int ic_startbutton=0x7f020004;  
25 - public static final int startbuttontoggle=0x7f020005;  
26 - }  
27 - public static final class id {  
28 - public static final int AbsoluteLayout1=0x7f0a0006;  
29 - public static final int LinearLayout1=0x7f0a0001;  
30 - public static final int button=0x7f0a0008;  
31 - public static final int itemhelp=0x7f0a000c;  
32 - public static final int itemprefs=0x7f0a000b;  
33 - public static final int listView1=0x7f0a0003;  
34 - public static final int menu_settings=0x7f0a000a;  
35 - public static final int rowTextView=0x7f0a0009;  
36 - public static final int textView1=0x7f0a0004;  
37 - public static final int textView2=0x7f0a0005;  
38 - public static final int textViewTitle=0x7f0a0002;  
39 - public static final int textViewXml=0x7f0a0007;  
40 - public static final int videoView1=0x7f0a0000;  
41 - }  
42 - public static final class layout {  
43 - public static final int activity_video=0x7f030000;  
44 - public static final int dirs=0x7f030001;  
45 - public static final int help=0x7f030002;  
46 - public static final int main_activity=0x7f030003;  
47 - public static final int rowlayout=0x7f030004;  
48 - }  
49 - public static final class menu {  
50 - public static final int activity_main=0x7f090000;  
51 - public static final int activity_video=0x7f090001;  
52 - public static final int menu=0x7f090002;  
53 - }  
54 - public static final class string {  
55 - public static final int app_name=0x7f070000;  
56 - public static final int button=0x7f07000c;  
57 - public static final int button1=0x7f07000d;  
58 - public static final int desc=0x7f070009;  
59 - public static final int descarregar=0x7f070003;  
60 - public static final int dir=0x7f07000a;  
61 - public static final int directoris=0x7f07000b;  
62 - public static final int hello_world=0x7f070010;  
63 - public static final int help=0x7f070008;  
64 - public static final int hint=0x7f070004;  
65 - public static final int menu_settings=0x7f070001;  
66 - public static final int prefs=0x7f070007;  
67 - public static final int startbuttondescription=0x7f07000f;  
68 - public static final int title=0x7f07000e;  
69 - public static final int title_activity_main=0x7f070002;  
70 - public static final int title_activity_video=0x7f070011;  
71 - public static final int url=0x7f070005;  
72 - public static final int urlhint=0x7f070006;  
73 - }  
74 - public static final class style {  
75 - public static final int AppTheme=0x7f080000;  
76 - }  
77 - public static final class xml {  
78 - public static final int prefs=0x7f040000;  
79 - }  
80 -}  
res/layout/main_activity.xml deleted
View file @e5f7a1a
1 -<?xml version="1.0" encoding="utf-8"?>  
2 -<AbsoluteLayout xmlns:android="http://schemas.android.com/apk/res/android"  
3 - xmlns:tools="http://schemas.android.com/tools"  
4 - android:id="@+id/AbsoluteLayout1"  
5 - android:layout_width="fill_parent"  
6 - android:layout_height="fill_parent"  
7 - android:background="@color/backgroundmain"  
8 - android:focusable="true"  
9 - android:focusableInTouchMode="true"  
10 - tools:ignore="Deprecated" >  
11 -  
12 - <TextView  
13 - android:id="@+id/textViewXml"  
14 - android:layout_width="wrap_content"  
15 - android:layout_height="wrap_content"  
16 - android:layout_x="38dp"  
17 - android:layout_y="423dp"  
18 - android:gravity="clip_vertical"  
19 - android:hint="@string/hint"  
20 - android:scrollbarStyle="insideInset"  
21 - android:scrollbars="vertical" />  
22 -  
23 - <ImageButton  
24 - android:id="@+id/button"  
25 - android:layout_width="256dp"  
26 - android:layout_height="256dp"  
27 - android:layout_x="33dp"  
28 - android:layout_y="74dp"  
29 - android:background="@drawable/startbuttontoggle"  
30 - android:contentDescription="@string/startbuttondescription"  
31 - android:focusableInTouchMode="false" />  
32 -  
33 -</AbsoluteLayout>  
34 \ No newline at end of file 0 \ No newline at end of file
src/com/upc/pbe/upcnews/Directoris.java
  View file @054f768
@@ -93,6 +93,9 @@ public class Directoris extends Activity implements OnItemClickListener @@ -93,6 +93,9 @@ public class Directoris extends Activity implements OnItemClickListener
93 { 93 {
94 text.setTypeface(null,Typeface.BOLD); 94 text.setTypeface(null,Typeface.BOLD);
95 Log.d(TAG, text.getText().toString()); 95 Log.d(TAG, text.getText().toString());
  96 + /*
  97 + * No va, mejorar (optional)
  98 + */
96 } 99 }
97 } 100 }
98 } 101 }
@@ -109,8 +112,8 @@ public class Directoris extends Activity implements OnItemClickListener @@ -109,8 +112,8 @@ public class Directoris extends Activity implements OnItemClickListener
109 { 112 {
110 ArrayList<ParentList> m3u8parsed = p.parseFile(playlist); 113 ArrayList<ParentList> m3u8parsed = p.parseFile(playlist);
111 Log.d(TAG, "parsing completed"); 114 Log.d(TAG, "parsing completed");
112 - //HLS h = new HLS(m3u8parsed);  
113 - //h.start(); 115 + HLS h = new HLS(m3u8parsed);
  116 + h.start();
114 117
115 } 118 }
116 catch (ErrorException e) 119 catch (ErrorException e)
src/com/upc/pbe/upcnews/HLS.java
  View file @054f768
@@ -6,25 +6,22 @@ public class HLS { @@ -6,25 +6,22 @@ public class HLS {
6 6
7 static final String TAG = "HLS"; 7 static final String TAG = "HLS";
8 8
9 - ArrayList<ParentList> ppls; 9 + ArrayList<ParentList> videos;
10 int numvideo; 10 int numvideo;
11 - int quality; //0 és la més alta 11 + int quality; //0 es la más alta
12 12
13 public HLS(ArrayList<ParentList> parsed) 13 public HLS(ArrayList<ParentList> parsed)
14 { 14 {
15 - this.ppls = parsed; 15 + this.videos = parsed;
16 numvideo = 0; 16 numvideo = 0;
17 quality = 0; 17 quality = 0;
18 } 18 }
19 19
20 - public void start(){  
21 -  
22 - //Primer vídeo que hi hagi, amb la millor qualitat possible  
23 - for(int i = 0 ; i < ppls.get(numvideo).getLists().get(quality).getSegments().size() ; i++){  
24 -  
25 - Segment seg = ppls.get(numvideo).getLists().get(quality).getSegments().get(i);  
26 -  
27 - 20 + public void start()
  21 + {
  22 + for(int i = 0 ; i < videos.get(numvideo).getLists().get(quality).getSegments().size() ; i++)
  23 + {
  24 + Segment seg = videos.get(numvideo).getLists().get(quality).getSegments().get(i);
28 } 25 }
29 } 26 }
30 27