Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed the way the date is displayed

This commit is contained in:
daniel oeh 2012-06-13 23:56:00 +02:00
parent db238af642
commit 80c7616c7d
2 changed files with 41 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/de/podfetcher/activity/ItemviewActivity.java
View File

@ -1,25 +1,27 @@
package de.podfetcher.activity; package de.podfetcher.activity;
import java.io.File; import java.text.DateFormat;
import java.util.concurrent.Callable;
import android.net.Uri;
import android.graphics.BitmapFactory;
import com.actionbarsherlock.app.SherlockActivity;
import android.view.View;
import android.widget.ListView;
import android.os.Bundle;
import de.podfetcher.feed.*;
import android.util.Log;
import android.content.Intent; import android.content.Intent;
import android.content.Context; import android.os.Bundle;
import android.text.format.DateUtils;
import android.util.Log;
import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.TextView;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView;
import com.actionbarsherlock.app.SherlockActivity;
import de.podfetcher.R; import de.podfetcher.R;
import de.podfetcher.feed.Feed;
import de.podfetcher.feed.FeedItem;
import de.podfetcher.feed.FeedManager;
import de.podfetcher.feed.FeedMedia;
import de.podfetcher.fragment.FeedlistFragment;
import de.podfetcher.service.DownloadObserver; import de.podfetcher.service.DownloadObserver;
import de.podfetcher.service.PlaybackService; import de.podfetcher.service.PlaybackService;
import de.podfetcher.storage.DownloadRequester; import de.podfetcher.storage.DownloadRequester;
import de.podfetcher.fragment.FeedlistFragment;
/** Displays a single FeedItem and provides various actions */ /** Displays a single FeedItem and provides various actions */
public class ItemviewActivity extends SherlockActivity { public class ItemviewActivity extends SherlockActivity {
@ -58,13 +60,17 @@ public class ItemviewActivity extends SherlockActivity {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
// Start playback Service // Start playback Service
Intent launchIntent = new Intent(v.getContext(), PlaybackService.class); Intent launchIntent = new Intent(v.getContext(),
launchIntent.putExtra(PlaybackService.EXTRA_MEDIA_ID, item.getMedia().getId()); PlaybackService.class);
launchIntent.putExtra(PlaybackService.EXTRA_FEED_ID, item.getFeed().getId()); launchIntent.putExtra(PlaybackService.EXTRA_MEDIA_ID, item
.getMedia().getId());
launchIntent.putExtra(PlaybackService.EXTRA_FEED_ID, item
.getFeed().getId());
v.getContext().startService(launchIntent); v.getContext().startService(launchIntent);
// Launch Mediaplayer // Launch Mediaplayer
Intent playerIntent = new Intent(v.getContext(), MediaplayerActivity.class); Intent playerIntent = new Intent(v.getContext(),
MediaplayerActivity.class);
v.getContext().startActivity(playerIntent); v.getContext().startActivity(playerIntent);
} }
}); });
@ -79,9 +85,11 @@ public class ItemviewActivity extends SherlockActivity {
/** Extracts FeedItem object the activity is supposed to display */ /** Extracts FeedItem object the activity is supposed to display */
private void extractFeeditem() { private void extractFeeditem() {
long itemId = getIntent().getLongExtra(FeedItemlistActivity.EXTRA_SELECTED_FEEDITEM, -1); long itemId = getIntent().getLongExtra(
long feedId = getIntent().getLongExtra(FeedlistFragment.EXTRA_SELECTED_FEED, -1); FeedItemlistActivity.EXTRA_SELECTED_FEEDITEM, -1);
if(itemId == -1 || feedId == -1) { long feedId = getIntent().getLongExtra(
FeedlistFragment.EXTRA_SELECTED_FEED, -1);
if (itemId == -1 || feedId == -1) {
Log.e(TAG, "Received invalid selection of either feeditem or feed."); Log.e(TAG, "Received invalid selection of either feeditem or feed.");
} }
Feed feed = manager.getFeed(feedId); Feed feed = manager.getFeed(feedId);
@ -101,10 +109,13 @@ public class ItemviewActivity extends SherlockActivity {
setTitle(item.getFeed().getTitle()); setTitle(item.getFeed().getTitle());
//txtvPublished.setText(item.getPubDate()); TODO fix txtvPublished.setText(DateUtils.formatSameDayTime(item.getPubDate()
.getTime(), System.currentTimeMillis(), DateFormat.MEDIUM,
DateFormat.SHORT));
txtvTitle.setText(item.getTitle()); txtvTitle.setText(item.getTitle());
if(item.getFeed().getImage() != null) { if (item.getFeed().getImage() != null) {
imgvImage.setImageBitmap(item.getFeed().getImage().getImageBitmap()); imgvImage
.setImageBitmap(item.getFeed().getImage().getImageBitmap());
} }
} }
@ -123,7 +134,8 @@ public class ItemviewActivity extends SherlockActivity {
final DownloadObserver downloadObserver = new DownloadObserver(this) { final DownloadObserver downloadObserver = new DownloadObserver(this) {
@Override @Override
protected void onProgressUpdate(DownloadObserver.DownloadStatus... values) { protected void onProgressUpdate(
DownloadObserver.DownloadStatus... values) {
} }
@ -138,7 +150,6 @@ public class ItemviewActivity extends SherlockActivity {
} }
}; };
private void setDownloadingState() { private void setDownloadingState() {
butDownload.setEnabled(false); butDownload.setEnabled(false);
butPlay.setEnabled(false); butPlay.setEnabled(false);
@ -157,5 +168,3 @@ public class ItemviewActivity extends SherlockActivity {
butRemove.setEnabled(false); butRemove.setEnabled(false);
} }
} }

7
src/de/podfetcher/util/Converter.java
View File

@ -1,7 +1,5 @@
package de.podfetcher.util; package de.podfetcher.util;
import java.util.Date;
import android.util.Log; import android.util.Log;
/** Provides methods for converting various units. */ /** Provides methods for converting various units. */
@ -80,9 +78,4 @@ public final class Converter {
return String.format("%02d:%02d", h, m); return String.format("%02d:%02d", h, m);
} }
/** Returns string that is supposed to be shown in the GUI. */
public static String getDateString(Date date) {
return null;
}
} }