Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed #79

This commit is contained in:
Mariotaku Lee 2015-03-20 20:40:27 +08:00
parent 100586d9cb
commit c123204952
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
twidere/src/main/java/org/mariotaku/twidere/util/Utils.java
View File

@ -2969,8 +2969,12 @@ public final class Utils implements Constants, TwitterConstants {
final Bundle args = new Bundle();
args.putLong(EXTRA_ACCOUNT_ID, accountId);
args.putParcelable(EXTRA_CURRENT_MEDIA, current);
args.putParcelable(EXTRA_STATUS, status);
args.putParcelable(EXTRA_MESSAGE, message);
if (status != null) {
args.putParcelable(EXTRA_STATUS, status);
}
if (message != null) {
args.putParcelable(EXTRA_MESSAGE, message);
}
args.putParcelableArray(EXTRA_MEDIA, media);
fragment.setArguments(args);
fragment.show(fm, "sensitive_content_warning");
@ -3008,7 +3012,12 @@ public final class Utils implements Constants, TwitterConstants {
intent.putExtra(EXTRA_ACCOUNT_ID, accountId);
intent.putExtra(EXTRA_CURRENT_MEDIA, current);
intent.putExtra(EXTRA_MEDIA, media);
intent.putExtra(EXTRA_STATUS, status);
if (status != null) {
intent.putExtra(EXTRA_STATUS, status);
}
if (message != null) {
intent.putExtra(EXTRA_MESSAGE, message);
}
intent.setClass(context, MediaViewerActivity.class);
context.startActivity(intent);
}

13
twidere/src/main/java/org/mariotaku/twidere/view/holder/StatusViewHolder.java
View File

@ -12,6 +12,7 @@ import android.view.View.OnClickListener;
import android.widget.ImageView;
import android.widget.TextView;
import org.mariotaku.twidere.Constants;
import org.mariotaku.twidere.R;
import org.mariotaku.twidere.adapter.iface.ContentCardClickListener;
import org.mariotaku.twidere.adapter.iface.IStatusesAdapter;
@ -35,6 +36,7 @@ import java.util.Locale;
import twitter4j.TranslationResult;
import static org.mariotaku.twidere.util.HtmlEscapeHelper.toPlainText;
import static org.mariotaku.twidere.util.Utils.getUserTypeIconRes;
/**
@ -42,7 +44,7 @@ import static org.mariotaku.twidere.util.Utils.getUserTypeIconRes;
* <p/>
* Created by mariotaku on 14/11/19.
*/
public class StatusViewHolder extends RecyclerView.ViewHolder implements OnClickListener {
public class StatusViewHolder extends RecyclerView.ViewHolder implements Constants, OnClickListener {
private final IStatusesAdapter<?> adapter;
@ -89,12 +91,11 @@ public class StatusViewHolder extends RecyclerView.ViewHolder implements OnClick
}
public void displaySampleStatus() {
nameView.setText("User");
screenNameView.setText("@user");
profileImageView.setImageResource(R.mipmap.ic_launcher);
nameView.setText(TWIDERE_PREVIEW_NAME);
screenNameView.setText("@" + TWIDERE_PREVIEW_SCREEN_NAME);
textView.setText(toPlainText(TWIDERE_PREVIEW_TEXT_HTML));
timeView.setTime(System.currentTimeMillis());
textView.setText(R.string.sample_status_text);
mediaPreviewContainer.displayMedia(R.drawable.profile_image_nyan_sakamoto,
R.drawable.profile_image_nyan_sakamoto_santa);
}
public void displayStatus(final ParcelableStatus status, final boolean displayInReplyTo) {