Browse Source

Some UI fixes in details screen.

pull/11/head
Eric Kok 12 years ago
parent
commit
8d9aee40bf
  1. 3
      core/res/layout/list_item_simple.xml
  2. 2
      core/src/org/transdroid/core/gui/DetailsActivity.java
  3. 3
      core/src/org/transdroid/core/gui/DetailsFragment.java
  4. 4
      core/src/org/transdroid/core/gui/lists/DetailsAdapter.java

3
core/res/layout/list_item_simple.xml

@ -12,6 +12,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="15sp" android:textSize="15sp"
android:textIsSelectable="false" /> android:textIsSelectable="false"
android:autoLink="web" />
</FrameLayout> </FrameLayout>

2
core/src/org/transdroid/core/gui/DetailsActivity.java

@ -113,6 +113,8 @@ public class DetailsActivity extends SherlockFragmentActivity implements Torrent
protected void refreshScreen() { protected void refreshScreen() {
fragmentDetails.updateIsLoading(true); fragmentDetails.updateIsLoading(true);
refreshTorrent(); refreshTorrent();
refreshTorrentDetails(torrent);
refreshTorrentFiles(torrent);
} }
@Background @Background

3
core/src/org/transdroid/core/gui/DetailsFragment.java

@ -141,10 +141,9 @@ public class DetailsFragment extends SherlockFragment {
detailsList.setVisibility(View.GONE); detailsList.setVisibility(View.GONE);
emptyText.setVisibility(!isLoadingTorrent? View.VISIBLE: View.GONE); emptyText.setVisibility(!isLoadingTorrent? View.VISIBLE: View.GONE);
loadingProgress.setVisibility(isLoadingTorrent? View.VISIBLE: View.GONE); loadingProgress.setVisibility(isLoadingTorrent? View.VISIBLE: View.GONE);
torrent = null; // Note: this.torrent is not cleared as we need to know later what the fragment was originally bound to
torrentDetails = null; torrentDetails = null;
torrentFiles = null; torrentFiles = null;
getActivity().supportInvalidateOptionsMenu();
} }
/** /**

4
core/src/org/transdroid/core/gui/lists/DetailsAdapter.java

@ -90,7 +90,7 @@ public class DetailsAdapter extends MergeAdapter {
* @param trackers The new list of trackers known for this torrent, or null if the list and header should be hidden * @param trackers The new list of trackers known for this torrent, or null if the list and header should be hidden
*/ */
public void updateTrackers(List<? extends SimpleListItem> trackers) { public void updateTrackers(List<? extends SimpleListItem> trackers) {
if (trackers == null) { if (trackers == null || trackers.isEmpty()) {
trackersAdapter.update(new ArrayList<SimpleListItemAdapter.SimpleStringItem>()); trackersAdapter.update(new ArrayList<SimpleListItemAdapter.SimpleStringItem>());
trackersSeparatorView.setVisibility(View.GONE); trackersSeparatorView.setVisibility(View.GONE);
} else { } else {
@ -104,7 +104,7 @@ public class DetailsAdapter extends MergeAdapter {
* @param errors The new list of errors known for this torrent, or null if the list and header should be hidden * @param errors The new list of errors known for this torrent, or null if the list and header should be hidden
*/ */
public void updateErrors(List<? extends SimpleListItem> errors) { public void updateErrors(List<? extends SimpleListItem> errors) {
if (errors == null) { if (errors == null || errors.isEmpty()) {
errorsAdapter.update(new ArrayList<SimpleListItemAdapter.SimpleStringItem>()); errorsAdapter.update(new ArrayList<SimpleListItemAdapter.SimpleStringItem>());
errorsSeparatorView.setVisibility(View.GONE); errorsSeparatorView.setVisibility(View.GONE);
} else { } else {

Loading…
Cancel
Save