From b2e74a5227ab5ab07153801d44a7f9c22436aba3 Mon Sep 17 00:00:00 2001 From: Joshua Bahnsen Date: Mon, 30 Dec 2013 03:31:07 -0700 Subject: [PATCH] Fix information views on shares and playlists --- .../activity/SelectPlaylistActivity.java | 19 ++++++++++++++++--- .../androidapp/activity/ShareActivity.java | 4 +++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectPlaylistActivity.java b/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectPlaylistActivity.java index 555c88e4..cd095c41 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectPlaylistActivity.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/activity/SelectPlaylistActivity.java @@ -25,6 +25,10 @@ import android.content.Intent; import android.os.AsyncTask; import android.os.Bundle; import android.text.Editable; +import android.text.Spannable; +import android.text.SpannableString; +import android.text.method.LinkMovementMethod; +import android.text.util.Linkify; import android.view.ContextMenu; import android.view.Menu; import android.view.MenuInflater; @@ -34,6 +38,7 @@ import android.widget.AdapterView; import android.widget.CheckBox; import android.widget.EditText; import android.widget.ListView; +import android.widget.TextView; import com.handmark.pulltorefresh.library.PullToRefreshBase; import com.handmark.pulltorefresh.library.PullToRefreshBase.OnRefreshListener; @@ -278,11 +283,19 @@ public class SelectPlaylistActivity extends SubsonicTabActivity implements Adapt private void displayPlaylistInfo(final Playlist playlist) { - String message = "Owner: " + playlist.getOwner() + "\nComments: " + + final TextView textView = new TextView(this); + textView.setPadding(5, 5, 5, 5); + + final Spannable message = new SpannableString("Owner: " + playlist.getOwner() + "\nComments: " + ((playlist.getComment() == null) ? "" : playlist.getComment()) + "\nSong Count: " + playlist.getSongCount() + - ((playlist.getPublic() == null) ? "" : ("\nPublic: " + playlist.getPublic()) + ((playlist.getCreated() == null) ? "" : ("\nCreation Date: " + playlist.getCreated().replace('T', ' ')))); - new AlertDialog.Builder(this).setIcon(android.R.drawable.ic_dialog_alert).setTitle(playlist.getName()).setMessage(message).show(); + ((playlist.getPublic() == null) ? "" : ("\nPublic: " + playlist.getPublic()) + ((playlist.getCreated() == null) ? "" : ("\nCreation Date: " + playlist.getCreated().replace('T', ' '))))); + + Linkify.addLinks(message, Linkify.WEB_URLS); + textView.setText(message); + textView.setMovementMethod(LinkMovementMethod.getInstance()); + + new AlertDialog.Builder(this).setTitle(playlist.getName()).setCancelable(true).setIcon(android.R.drawable.ic_dialog_info).setView(textView).show(); } private void updatePlaylistInfo(final Playlist playlist) diff --git a/src/com/thejoshwa/ultrasonic/androidapp/activity/ShareActivity.java b/src/com/thejoshwa/ultrasonic/androidapp/activity/ShareActivity.java index 7d5fef39..b64b60bb 100644 --- a/src/com/thejoshwa/ultrasonic/androidapp/activity/ShareActivity.java +++ b/src/com/thejoshwa/ultrasonic/androidapp/activity/ShareActivity.java @@ -264,7 +264,7 @@ public class ShareActivity extends SubsonicTabActivity implements AdapterView.On private void displayShareInfo(final Share share) { final TextView textView = new TextView(this); - textView.setPadding(3, 3, 3, 3); + textView.setPadding(5, 5, 5, 5); final Spannable message = new SpannableString("Owner: " + share.getUsername() + "\nComments: " + ((share.getDescription() == null) ? "" : share.getDescription()) + @@ -308,6 +308,8 @@ public class ShareActivity extends SubsonicTabActivity implements AdapterView.On } }); + noExpirationCheckBox.setChecked(true); + timeSpanPicker.setTimeSpanDisableText(getResources().getText(R.string.no_expiration)); hideDialogCheckBox.setVisibility(View.GONE);