Skip to content

Commit 3325a6a

Browse files
Wick96Wick96
committed
Merge remote-tracking branch 'origin/master'
2 parents 2ed6f90 + fb59330 commit 3325a6a

File tree

6 files changed

+186
-21
lines changed

6 files changed

+186
-21
lines changed

‎.idea/modules.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src/main/java/com/example/pp/podcastplayer/DataObject.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@ public class DataObject {
88
private String mText1;
99
private String mText2;
1010
private String mImg1;
11+
private String mUrl;
1112

12-
DataObject (String text1, String text2, String img1){
13+
14+
DataObject (String text1, String text2, String img1, String url){
1315
mText1 = text1;
1416
mText2 = text2;
1517
mImg1 = img1;
18+
mUrl = url;
1619
}
1720

1821
public String getmText1() {
@@ -38,4 +41,10 @@ public String getmImg1() {
3841
public void setmImg1(String mImg1) {
3942
this.mImg1 = mImg1;
4043
}
44+
45+
public String getmUrl() {
46+
return mUrl;
47+
}
48+
49+
public void setmUrl(String mUrl) {this.mUrl = mUrl; }
4150
}

‎app/src/main/java/com/example/pp/podcastplayer/MainActivity.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public class MainActivity extends AppCompatActivity
4343
private RecyclerView.LayoutManager mLayoutManager;
4444
private static String LOG_TAG = "CardViewActivity";
4545
String urlRSS;
46+
String urlMP3;
4647
DataRSS data;
4748
String naslov;
4849
String opis;
@@ -220,7 +221,7 @@ private ArrayList<DataObject> getDataSet() {
220221
int i = 0;
221222

222223

223-
DataObject obj = new DataObject(naslov, opis, slika[slika.length - 1]);
224+
DataObject obj = new DataObject(naslov, opis, slika[slika.length - 1], urlMP3);
224225
results.add(i, obj);
225226
i++;
226227

@@ -258,6 +259,7 @@ protected Boolean doInBackground(Void... voids) {
258259

259260
naslov = data.naslov;
260261
opis = data.opis;
262+
urlMP3 =
261263

262264
slika_url = data.slika;
263265
Log.d("aaa", slika_url);

‎app/src/main/java/com/example/pp/podcastplayer/MyRecyclerViewAdapter.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,13 @@ public static class DataObjectHolder extends RecyclerView.ViewHolder
2929
TextView label;
3030
TextView dateTime;
3131
ImageView img;
32+
TextView url;
33+
3234

3335
public DataObjectHolder(View itemView) {
3436
super(itemView);
3537
label = (TextView) itemView.findViewById(R.id.textView);
38+
url = (TextView) itemView.findViewById(R.id.textView3);
3639
dateTime = (TextView) itemView.findViewById(R.id.textView2);
3740
img = (ImageView) itemView.findViewById(R.id.imageView2);
3841
Log.i(LOG_TAG, "Adding Listener");
@@ -44,7 +47,7 @@ public void onClick(View v) {
4447
// myClickListener.onItemClick(getAdapterPosition(), v);
4548
Intent intent = new Intent(v.getContext(), PodcastList.class);
4649
Bundle bundle = new Bundle();
47-
bundle.putString("naslov",(String) label.getText());
50+
bundle.putString("url",(String) url.getText());
4851
intent.putExtras(bundle);
4952
v.getContext().startActivity(intent);
5053
}
@@ -74,6 +77,7 @@ public void onBindViewHolder(DataObjectHolder holder, int position) {
7477
holder.dateTime.setText(mDataset.get(position).getmText2());
7578
Bitmap bitmap = BitmapFactory.decodeFile(Environment.getExternalStorageDirectory().getAbsolutePath()+"/downloads/images/"+mDataset.get(position).getmImg1());
7679
holder.img.setImageBitmap(bitmap);
80+
holder.url.setText(mDataset.get(position).getmUrl());
7781
}
7882

7983
public void addItem(DataObject dataObj, int index) {

‎app/src/main/java/com/example/pp/podcastplayer/PodcastList.java

Lines changed: 141 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,72 @@
11
package com.example.pp.podcastplayer;
22

33
import android.content.Intent;
4+
import android.os.AsyncTask;
45
import android.os.Bundle;
56
import android.support.design.widget.FloatingActionButton;
7+
import android.support.design.widget.NavigationView;
68
import android.support.design.widget.Snackbar;
9+
import android.support.v4.widget.DrawerLayout;
10+
import android.support.v7.app.ActionBarDrawerToggle;
711
import android.support.v7.app.AppCompatActivity;
12+
import android.support.v7.widget.LinearLayoutManager;
13+
import android.support.v7.widget.RecyclerView;
814
import android.support.v7.widget.Toolbar;
15+
import android.util.Log;
916
import android.view.View;
1017
import android.widget.TextView;
1118

19+
import org.xmlpull.v1.XmlPullParserException;
20+
21+
import java.io.IOException;
22+
import java.io.InputStream;
23+
import java.net.MalformedURLException;
24+
import java.net.URL;
25+
import java.util.ArrayList;
26+
1227
public class PodcastList extends AppCompatActivity {
1328

29+
private RecyclerView mRecyclerView;
30+
private RecyclerView.Adapter mAdapter;
31+
private RecyclerView.LayoutManager mLayoutManager;
32+
private static String LOG_TAG = "CardViewActivity";
33+
34+
DataRSSmp3 data;
35+
36+
String naslov;
37+
String urlMP3;
38+
String opis;
39+
String[] slika;
40+
String urlRSS;
41+
String slika_url;
42+
43+
44+
1445
@Override
1546
protected void onCreate(Bundle savedInstanceState) {
1647
super.onCreate(savedInstanceState);
1748
setContentView(R.layout.activity_podcast_list);
1849
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
1950
setSupportActionBar(toolbar);
2051
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
21-
String myString = "";
52+
// String myString = "";
2253
Intent intent = getIntent();
54+
55+
loadStart();
56+
2357
if (intent != null) {
2458
Bundle bundle = intent.getExtras();
2559
if (bundle != null) {
26-
myString = bundle.getString("naslov");
27-
if (myString == null) {
28-
myString = "Bongo";
60+
urlRSS = bundle.getString("url");
61+
if (urlRSS == null) {
62+
urlRSS = "Bongo";
63+
} else {
64+
new PodcastList.FetchFeedTask().execute((Void) null);
2965
}
3066
}
3167
}
32-
TextView tv = (TextView) findViewById(R.id.textView3);
33-
tv.setText(myString);
68+
//TextView tv = (TextView) findViewById(R.id.textView3);
69+
//tv.setText(myString);
3470

3571

3672
}
@@ -41,4 +77,103 @@ public boolean onSupportNavigateUp(){
4177
return true;
4278
}
4379

80+
public void loadStart() {
81+
82+
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
83+
setContentView(R.layout.activity_main);
84+
85+
86+
mRecyclerView = (RecyclerView) findViewById(R.id.my_recycler_view);
87+
mRecyclerView.setHasFixedSize(true);
88+
mLayoutManager = new LinearLayoutManager(this);
89+
mRecyclerView.setLayoutManager(mLayoutManager);
90+
91+
}
92+
93+
94+
ArrayList results = new ArrayList<DataObject>();
95+
96+
private ArrayList<DataObject> getDataSet() {
97+
int i = 0;
98+
99+
DataObject obj = new DataObject(naslov, opis, slika[slika.length - 1], urlMP3);
100+
results.add(i, obj);
101+
i++;
102+
103+
return results;
104+
}
105+
106+
107+
// Izvajanje kode v ozadju (pridobivanje podatkov)
108+
private class FetchFeedTask extends AsyncTask<Void, Void, Boolean> {
109+
110+
private String url;
111+
int i = 0;
112+
ParserMP3 pMP3 = new ParserMP3();
113+
114+
@Override
115+
// Pridobimo url
116+
protected void onPreExecute() {
117+
url = urlRSS;
118+
//Log.d("Add", url);
119+
}
120+
121+
@Override
122+
protected Boolean doInBackground(Void... voids) {
123+
124+
try {
125+
//Log.d("Add", url);
126+
URL urlConnection = new URL(url);
127+
InputStream inputStream = urlConnection.openConnection().getInputStream();
128+
// Razclenimo podatke iz povezave
129+
data = pMP3.parseData(inputStream);
130+
//Log.d("Add", data.naslov);
131+
// Log.d("Add", data.naslov);
132+
133+
134+
naslov = data.naslov;
135+
opis = data.opis;
136+
urlMP3 = data.mp3;
137+
138+
139+
Log.d("d", urlMP3);
140+
141+
if (slika_url == null) {
142+
slika_url = "https://upload.wikimedia.org/wikipedia/commons/c/c9/Moon.jpg";
143+
slika = slika_url.split("/"); // Zadnji element je ime slike
144+
// String str_result= new Downloadimages().execute(slika_url).get();
145+
Downloader d = new Downloader();
146+
String code = d.DownloadFile(slika_url, "downloads/images", slika[slika.length - 1]);
147+
148+
} else {
149+
slika = slika_url.split("/");
150+
// String str_result= new Downloadimages().execute(slika_url).get();
151+
Downloader d = new Downloader();
152+
String code = d.DownloadFile(slika_url, "downloads/images", slika[slika.length - 1]);
153+
}
154+
155+
return true;
156+
157+
} catch (MalformedURLException e) {
158+
e.printStackTrace();
159+
} catch (IOException e) {
160+
e.printStackTrace();
161+
} catch (XmlPullParserException e) {
162+
e.printStackTrace();
163+
}
164+
165+
return false;
166+
}
167+
168+
@Override
169+
protected void onPostExecute(Boolean success) {
170+
if (success) {
171+
172+
mAdapter = new MyRecyclerViewAdapter(getDataSet());
173+
mRecyclerView.setAdapter(mAdapter);
174+
175+
}
176+
}
177+
}
178+
44179
}

‎app/src/main/res/layout/card_view_row.xml

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,17 @@
3030
card_view:layout_constraintTop_toTopOf="parent" />
3131

3232
<TextView
33-
android:id="@+id/textView2"
34-
android:layout_width="0dp"
35-
android:layout_height="wrap_content"
36-
android:layout_centerVertical="true"
37-
android:layout_marginStart="8dp"
38-
android:layout_marginTop="16dp"
39-
android:layout_toEndOf="@+id/textView"
40-
card_view:layout_constraintBottom_toBottomOf="parent"
41-
card_view:layout_constraintEnd_toEndOf="parent"
42-
card_view:layout_constraintStart_toEndOf="@+id/imageView2"
43-
card_view:layout_constraintTop_toBottomOf="@+id/textView" />
33+
android:id="@+id/textView2"
34+
android:layout_width="0dp"
35+
android:layout_height="wrap_content"
36+
android:layout_centerVertical="true"
37+
android:layout_marginStart="8dp"
38+
android:layout_marginTop="16dp"
39+
android:layout_toEndOf="@+id/textView"
40+
card_view:layout_constraintBottom_toBottomOf="parent"
41+
card_view:layout_constraintEnd_toEndOf="parent"
42+
card_view:layout_constraintStart_toEndOf="@+id/imageView2"
43+
card_view:layout_constraintTop_toBottomOf="@+id/textView" />
4444

4545
<TextView
4646
android:id="@+id/textView"
@@ -53,6 +53,21 @@
5353
card_view:layout_constraintEnd_toEndOf="parent"
5454
card_view:layout_constraintStart_toEndOf="@+id/imageView2"
5555
card_view:layout_constraintTop_toTopOf="parent" />
56+
57+
58+
<TextView
59+
android:id="@+id/textView3"
60+
android:layout_width="0dp"
61+
android:layout_height="wrap_content"
62+
android:layout_centerVertical="true"
63+
android:layout_marginStart="8dp"
64+
android:layout_marginTop="1dp"
65+
android:visibility="invisible"
66+
android:layout_toEndOf="@+id/textView"
67+
card_view:layout_constraintBottom_toBottomOf="parent"
68+
card_view:layout_constraintEnd_toEndOf="parent"
69+
card_view:layout_constraintStart_toEndOf="@+id/imageView2"
70+
card_view:layout_constraintTop_toBottomOf="@+id/textView" />
5671
</android.support.constraint.ConstraintLayout>
5772

5873
</android.support.v7.widget.CardView>

0 commit comments

Comments
 (0)