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

fixed read from bottom in home/mentions timeline 

improved media viewer ui
This commit is contained in:
Mariotaku Lee 2015-03-18 15:34:23 +08:00
parent 98297fa860
commit 5fc7b03a7c
21 changed files with 53 additions and 521 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
twidere.component.common/src/main/java/org/mariotaku/twidere/constant/IntentConstants.java
View File

@ -210,6 +210,7 @@ public interface IntentConstants {
public static final String EXTRA_RESTART_ACTIVITY = "restart_activity";
public static final String EXTRA_FROM_USER = "from_user";
public static final String EXTRA_SHOW_MEDIA_PREVIEW = "show_media_preview";
public static final String EXTRA_SHOW_EXTRA_TYPE = "show_extra_type";
public static final String EXTRA_BITMAP = "bitmap";
public static final String EXTRA_SOURCE = "source";
public static final String EXTRA_DESTINATION = "destination";

13
twidere/src/fdroid/res/menu/menu_osm_viewer.xml
View File

@ -18,12 +18,13 @@
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@id/center"
android:icon="@drawable/ic_action_my_location"
android:showAsAction="always"
android:title="@string/center"/>
<item
android:id="@id/center"
android:icon="@drawable/ic_action_my_location"
app:showAsAction="always"
android:title="@string/center"/>
</menu>

491
twidere/src/main/java/com/readystatesoftware/viewbadger/BadgeView.java
View File

@ -1,491 +0,0 @@
package com.readystatesoftware.viewbadger;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Color;
import android.graphics.Typeface;
import android.graphics.drawable.ShapeDrawable;
import android.graphics.drawable.shapes.RoundRectShape;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams;
import android.view.ViewParent;
import android.view.animation.AccelerateInterpolator;
import android.view.animation.AlphaAnimation;
import android.view.animation.Animation;
import android.view.animation.DecelerateInterpolator;
import android.widget.FrameLayout;
import android.widget.TabWidget;
import android.widget.TextView;
import org.mariotaku.twidere.util.accessor.ViewAccessor;
/**
* A simple text label view that can be applied as a "badge" to any given
* {@link android.view.View}. This class is intended to be instantiated at
* runtime rather than included in XML layouts.
*
* @author Jeff Gilfelt
*/
public class BadgeView extends TextView {
public static final int POSITION_TOP_LEFT = 1;
public static final int POSITION_TOP_RIGHT = 2;
public static final int POSITION_BOTTOM_LEFT = 3;
public static final int POSITION_BOTTOM_RIGHT = 4;
public static final int POSITION_CENTER = 5;
private static final int DEFAULT_MARGIN_DIP = 5;
private static final int DEFAULT_LR_PADDING_DIP = 5;
private static final int DEFAULT_CORNER_RADIUS_DIP = 8;
private static final int DEFAULT_POSITION = POSITION_TOP_RIGHT;
private static final int DEFAULT_BADGE_COLOR = Color.parseColor("#CCFF4444"); // holo_red_light;
private static final int DEFAULT_TEXT_COLOR = Color.WHITE;
private static Animation fadeIn;
private static Animation fadeOut;
private Context context;
private View target;
private int badgePosition;
private int badgeMarginH;
private int badgeMarginV;
private int badgeColor;
private boolean isShown;
private ShapeDrawable badgeBg;
private int targetTabIndex;
public BadgeView(final Context context) {
this(context, (AttributeSet) null, android.R.attr.textViewStyle);
}
public BadgeView(final Context context, final AttributeSet attrs) {
this(context, attrs, android.R.attr.textViewStyle);
}
public BadgeView(final Context context, final AttributeSet attrs, final int defStyle) {
this(context, attrs, defStyle, null, 0);
}
public BadgeView(final Context context, final AttributeSet attrs, final int defStyle, final View target,
final int tabIndex) {
super(context, attrs, defStyle);
init(context, target, tabIndex);
}
/**
* Constructor -
*
* create a new BadgeView instance attached to a target
* {@link android.widget.TabWidget} tab at a given index.
*
* @param context context for this view.
* @param target the TabWidget to attach the badge to.
* @param index the position of the tab within the target.
*/
public BadgeView(final Context context, final TabWidget target, final int index) {
this(context, null, android.R.attr.textViewStyle, target, index);
}
/**
* Constructor -
*
* create a new BadgeView instance attached to a target
* {@link android.view.View}.
*
* @param context context for this view.
* @param target the View to attach the badge to.
*/
public BadgeView(final Context context, final View target) {
this(context, null, android.R.attr.textViewStyle, target, 0);
}
/**
* Decrement the numeric badge label. If the current badge label cannot be
* converted to an integer value, its label will be set to "0".
*
* @param offset the decrement offset.
*/
public int decrement(final int offset) {
return increment(-offset);
}
/**
* Returns the color value of the badge background.
*
*/
public int getBadgeBackgroundColor() {
return badgeColor;
}
/**
* Returns the positioning of this badge.
*
* one of POSITION_TOP_LEFT, POSITION_TOP_RIGHT, POSITION_BOTTOM_LEFT,
* POSITION_BOTTOM_RIGHT, POSTION_CENTER.
*
*/
public int getBadgePosition() {
return badgePosition;
}
/**
* Returns the horizontal margin from the target View that is applied to
* this badge.
*
*/
public int getHorizontalBadgeMargin() {
return badgeMarginH;
}
/**
* Returns the target View this badge has been attached to.
*
*/
public View getTarget() {
return target;
}
/**
* Returns the vertical margin from the target View that is applied to this
* badge.
*
*/
public int getVerticalBadgeMargin() {
return badgeMarginV;
}
/**
* Make the badge non-visible in the UI.
*
*/
public void hide() {
hide(false, null);
}
/**
* Make the badge non-visible in the UI.
*
* @param anim Animation to apply to the view when made non-visible.
*/
public void hide(final Animation anim) {
hide(true, anim);
}
/**
* Make the badge non-visible in the UI.
*
* @param animate flag to apply the default fade-out animation.
*/
public void hide(final boolean animate) {
hide(animate, fadeOut);
}
/**
* Increment the numeric badge label. If the current badge label cannot be
* converted to an integer value, its label will be set to "0".
*
* @param offset the increment offset.
*/
public int increment(final int offset) {
final CharSequence txt = getText();
int i;
if (txt != null) {
try {
i = Integer.parseInt(txt.toString());
} catch (final NumberFormatException e) {
i = 0;
}
} else {
i = 0;
}
i = i + offset;
setText(String.valueOf(i));
return i;
}
/**
* Is this badge currently visible in the UI?
*
*/
@Override
public boolean isShown() {
return isShown;
}
/**
* Set the color value of the badge background.
*
* @param badgeColor the badge background color.
*/
public void setBadgeBackgroundColor(final int badgeColor) {
this.badgeColor = badgeColor;
badgeBg = getDefaultBackground();
}
/**
* Set the horizontal/vertical margin from the target View that is applied
* to this badge.
*
* @param badgeMargin the margin in pixels.
*/
public void setBadgeMargin(final int badgeMargin) {
badgeMarginH = badgeMargin;
badgeMarginV = badgeMargin;
}
/**
* Set the horizontal/vertical margin from the target View that is applied
* to this badge.
*
* @param horizontal margin in pixels.
* @param vertical margin in pixels.
*/
public void setBadgeMargin(final int horizontal, final int vertical) {
badgeMarginH = horizontal;
badgeMarginV = vertical;
}
/**
* Set the positioning of this badge.
*
* @param layoutPosition one of POSITION_TOP_LEFT, POSITION_TOP_RIGHT,
* POSITION_BOTTOM_LEFT, POSITION_BOTTOM_RIGHT, POSTION_CENTER.
*
*/
public void setBadgePosition(final int layoutPosition) {
badgePosition = layoutPosition;
}
public int setCount(final int count) {
setText(String.valueOf(count));
return count;
}
/**
* Make the badge visible in the UI.
*
*/
public void show() {
show(false, null);
}
/**
* Make the badge visible in the UI.
*
* @param anim Animation to apply to the view when made visible.
*/
public void show(final Animation anim) {
show(true, anim);
}
/**
* Make the badge visible in the UI.
*
* @param animate flag to apply the default fade-in animation.
*/
public void show(final boolean animate) {
show(animate, fadeIn);
}
/**
* Toggle the badge visibility in the UI.
*
*/
public void toggle() {
toggle(false, null, null);
}
/**
* Toggle the badge visibility in the UI.
*
* @param animIn Animation to apply to the view when made visible.
* @param animOut Animation to apply to the view when made non-visible.
*/
public void toggle(final Animation animIn, final Animation animOut) {
toggle(true, animIn, animOut);
}
/**
* Toggle the badge visibility in the UI.
*
* @param animate flag to apply the default fade-in/out animation.
*/
public void toggle(final boolean animate) {
toggle(animate, fadeIn, fadeOut);
}
@Override
protected void onSizeChanged(final int w, final int h, final int oldw, final int oldh) {
setMinWidth(h);
super.onSizeChanged(w, h, oldw, oldh);
}
private void applyLayoutParams() {
final FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(LayoutParams.WRAP_CONTENT,
LayoutParams.WRAP_CONTENT);
switch (badgePosition) {
case POSITION_TOP_LEFT:
lp.gravity = Gravity.LEFT | Gravity.TOP;
lp.setMargins(badgeMarginH, badgeMarginV, 0, 0);
break;
case POSITION_TOP_RIGHT:
lp.gravity = Gravity.RIGHT | Gravity.TOP;
lp.setMargins(0, badgeMarginV, badgeMarginH, 0);
break;
case POSITION_BOTTOM_LEFT:
lp.gravity = Gravity.LEFT | Gravity.BOTTOM;
lp.setMargins(badgeMarginH, 0, 0, badgeMarginV);
break;
case POSITION_BOTTOM_RIGHT:
lp.gravity = Gravity.RIGHT | Gravity.BOTTOM;
lp.setMargins(0, 0, badgeMarginH, badgeMarginV);
break;
case POSITION_CENTER:
lp.gravity = Gravity.CENTER;
lp.setMargins(0, 0, 0, 0);
break;
default:
break;
}
setLayoutParams(lp);
}
private void applyTo(View target) {
final LayoutParams lp = target.getLayoutParams();
final ViewParent parent = target.getParent();
final FrameLayout container = new FrameLayout(context);
if (target instanceof TabWidget) {
// set target to the relevant tab child container
target = ((TabWidget) target).getChildTabViewAt(targetTabIndex);
this.target = target;
((ViewGroup) target).addView(container, new LayoutParams(LayoutParams.MATCH_PARENT,
LayoutParams.MATCH_PARENT));
setVisibility(View.GONE);
container.addView(this);
} else {
// TODO verify that parent is indeed a ViewGroup
final ViewGroup group = (ViewGroup) parent;
final int index = group.indexOfChild(target);
group.removeView(target);
group.addView(container, index, lp);
container.addView(target);
setVisibility(View.GONE);
container.addView(this);
group.invalidate();
}
}
private int dipToPixels(final int dip) {
final Resources r = getResources();
final float px = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dip, r.getDisplayMetrics());
return (int) px;
}
private ShapeDrawable getDefaultBackground() {
final int r = dipToPixels(DEFAULT_CORNER_RADIUS_DIP);
final float[] outerR = new float[] { r, r, r, r, r, r, r, r };
final RoundRectShape rr = new RoundRectShape(outerR, null, null);
final ShapeDrawable drawable = new ShapeDrawable(rr);
drawable.getPaint().setColor(badgeColor);
return drawable;
}
private void hide(final boolean animate, final Animation anim) {
setVisibility(View.GONE);
if (animate) {
startAnimation(anim);
}
isShown = false;
}
private void init(final Context context, final View target, final int tabIndex) {
this.context = context;
this.target = target;
targetTabIndex = tabIndex;
setGravity(Gravity.CENTER);
// apply defaults
badgePosition = DEFAULT_POSITION;
badgeMarginH = dipToPixels(DEFAULT_MARGIN_DIP);
badgeMarginV = badgeMarginH;
badgeColor = DEFAULT_BADGE_COLOR;
setTypeface(Typeface.DEFAULT_BOLD);
final int paddingPixels = dipToPixels(DEFAULT_LR_PADDING_DIP);
setPadding(paddingPixels, 0, paddingPixels, 0);
setTextColor(DEFAULT_TEXT_COLOR);
fadeIn = new AlphaAnimation(0, 1);
fadeIn.setInterpolator(new DecelerateInterpolator());
fadeIn.setDuration(200);
fadeOut = new AlphaAnimation(1, 0);
fadeOut.setInterpolator(new AccelerateInterpolator());
fadeOut.setDuration(200);
isShown = false;
if (this.target != null) {
applyTo(this.target);
} else {
show();
}
}
private void show(final boolean animate, final Animation anim) {
if (getBackground() == null) {
if (badgeBg == null) {
badgeBg = getDefaultBackground();
}
ViewAccessor.setBackground(this, badgeBg);
}
applyLayoutParams();
if (animate) {
startAnimation(anim);
}
setVisibility(View.VISIBLE);
isShown = true;
}
private void toggle(final boolean animate, final Animation animIn, final Animation animOut) {
if (isShown) {
hide(animate && animOut != null, animOut);
} else {
show(animate && animIn != null, animIn);
}
}
}

1
twidere/src/main/java/org/mariotaku/twidere/activity/support/HomeActivity.java
View File

@ -581,7 +581,6 @@ public class HomeActivity extends BaseActionBarActivity implements OnClickListen
if (fragment instanceof AccountsDashboardFragment) {
((AccountsDashboardFragment) fragment).setStatusBarHeight(insets.top);
}
//TODO
mColorStatusFrameLayout.setStatusBarHeight(insets.top);
}

5
twidere/src/main/java/org/mariotaku/twidere/activity/support/MediaViewerActivity.java
View File

@ -145,6 +145,7 @@ public final class MediaViewerActivity extends ThemedActionBarActivity implement
final Bundle args = new Bundle();
args.putParcelable(EXTRA_STATUS, intent.getParcelableExtra(EXTRA_STATUS));
args.putBoolean(EXTRA_SHOW_MEDIA_PREVIEW, false);
args.putBoolean(EXTRA_SHOW_EXTRA_TYPE, false);
f.setArguments(args);
ft.replace(R.id.media_status, f);
ft.commit();
@ -314,6 +315,10 @@ public final class MediaViewerActivity extends ThemedActionBarActivity implement
saveToGallery();
return true;
}
case R.id.refresh: {
loadImage();
return true;
}
}
return super.onOptionsItemSelected(item);
}

2
twidere/src/main/java/org/mariotaku/twidere/adapter/AbsActivitiesAdapter.java
View File

@ -212,7 +212,7 @@ public abstract class AbsActivitiesAdapter<Data> extends Adapter<ViewHolder> imp
final StatusViewHolder statusViewHolder = (StatusViewHolder) holder;
statusViewHolder.displayStatus(getContext(), getImageLoader(), getImageLoadingHandler(),
getTwitterWrapper(), isMediaPreviewDisplayed(), false, false, isNameFirst(),
isNicknameOnly(), getProfileImageStyle(), getMediaPreviewStyle(), status, null);
isNicknameOnly(), getProfileImageStyle(), getMediaPreviewStyle(), status, null, true);
break;
}
case ITEM_VIEW_TYPE_TITLE_SUMMARY: {

20
twidere/src/main/java/org/mariotaku/twidere/fragment/support/AbsStatusesFragment.java
View File

@ -157,7 +157,7 @@ public abstract class AbsStatusesFragment<Data> extends BaseSupportFragment impl
final int backgroundColor = ThemeUtils.getThemeBackgroundColor(context);
final int colorRes = ColorUtils.getContrastYIQ(backgroundColor,
R.color.bg_refresh_progress_color_light, R.color.bg_refresh_progress_color_dark);
mSwipeRefreshLayout.setProgressBackgroundColor(colorRes);
mSwipeRefreshLayout.setProgressBackgroundColorSchemeResource(colorRes);
mAdapter = onCreateAdapter(context, compact);
mLayoutManager = new LinearLayoutManager(context);
mLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
@ -304,13 +304,13 @@ public abstract class AbsStatusesFragment<Data> extends BaseSupportFragment impl
public void onStatusActionClick(StatusViewHolder holder, int id, int position) {
final ParcelableStatus status = mAdapter.getStatus(position);
if (status == null) return;
final FragmentActivity activity = getActivity();
switch (id) {
case R.id.reply_count: {
final Context context = getActivity();
final Intent intent = new Intent(INTENT_ACTION_REPLY);
intent.setPackage(context.getPackageName());
intent.setPackage(activity.getPackageName());
intent.putExtra(EXTRA_STATUS, status);
context.startActivity(intent);
activity.startActivity(intent);
break;
}
case R.id.retweet_count: {
@ -323,14 +323,18 @@ public abstract class AbsStatusesFragment<Data> extends BaseSupportFragment impl
if (status.is_favorite) {
twitter.destroyFavoriteAsync(status.account_id, status.id);
//spice
SpiceProfilingUtil.profile(getActivity(), status.account_id, status.id + ",Unfavor," + status.account_id + "," + status.user_id + "," + status.timestamp);
SpiceProfilingUtil.log(getActivity(), status.id + ",Unfavor," + status.account_id + "," + status.user_id + "," + status.timestamp);
SpiceProfilingUtil.profile(activity, status.account_id, status.id + ",Unfavor,"
+ status.account_id + "," + status.user_id + "," + status.timestamp);
SpiceProfilingUtil.log(activity, status.id + ",Unfavor," + status.account_id
+ "," + status.user_id + "," + status.timestamp);
//end
} else {
twitter.createFavoriteAsync(status.account_id, status.id);
//spice
SpiceProfilingUtil.profile(getActivity(), status.account_id, status.id + ",Favor," + status.account_id + "," + status.user_id + "," + status.timestamp);
SpiceProfilingUtil.log(getActivity(), status.id + ",Favor," + status.account_id + "," + status.user_id + "," + status.timestamp);
SpiceProfilingUtil.profile(activity, status.account_id, status.id + ",Favor,"
+ status.account_id + "," + status.user_id + "," + status.timestamp);
SpiceProfilingUtil.log(activity, status.id + ",Favor," + status.account_id
+ "," + status.user_id + "," + status.timestamp);
//end
}
break;

7
twidere/src/main/java/org/mariotaku/twidere/fragment/support/CursorStatusesFragment.java
View File

@ -140,7 +140,12 @@ public abstract class CursorStatusesFragment extends AbsStatusesFragment<Cursor>
}
protected void reloadStatuses() {
getLoaderManager().restartLoader(0, getArguments(), this);
final Bundle args = new Bundle(), fragmentArgs = getArguments();
if (fragmentArgs != null) {
args.putAll(fragmentArgs);
args.putBoolean(EXTRA_FROM_USER, true);
}
getLoaderManager().restartLoader(0, args, this);
}
@Override

2
twidere/src/main/java/org/mariotaku/twidere/fragment/support/RetweetQuoteDialogFragment.java
View File

@ -103,7 +103,7 @@ public class RetweetQuoteDialogFragment extends BaseSupportDialogFragment implem
builder.setNegativeButton(android.R.string.cancel, null);
holder.displayStatus(context, loader, handler, twitter, displayMediaPreview, true,
true, nameFirst, nicknameOnly, profileImageStyle, mediaPreviewStyle, status, null);
true, nameFirst, nicknameOnly, profileImageStyle, mediaPreviewStyle, status, null, true);
view.findViewById(R.id.item_menu).setVisibility(View.GONE);
view.findViewById(R.id.action_buttons).setVisibility(View.GONE);

2
twidere/src/main/java/org/mariotaku/twidere/fragment/support/StatusTranslateDialogFragment.java
View File

@ -140,7 +140,7 @@ public class StatusTranslateDialogFragment extends BaseSupportDialogFragment imp
final boolean displayMediaPreview = preferences.getBoolean(KEY_MEDIA_PREVIEW, false);
mHolder.displayStatus(activity, loader, handler, twitter, displayMediaPreview, true,
true, nameFirst, nicknameOnly, profileImageStyle, mediaPreviewStyle, status, null);
true, nameFirst, nicknameOnly, profileImageStyle, mediaPreviewStyle, status, null, true);
mStatusContainer.findViewById(R.id.item_menu).setVisibility(View.GONE);
mStatusContainer.findViewById(R.id.action_buttons).setVisibility(View.GONE);

4
twidere/src/main/java/org/mariotaku/twidere/fragment/support/ViewStatusDialogFragment.java
View File

@ -81,6 +81,7 @@ public class ViewStatusDialogFragment extends BaseSupportDialogFragment {
final int mediaPreviewStyle = Utils.getMediaPreviewStyle(preferences.getString(KEY_MEDIA_PREVIEW_STYLE, null));
final boolean nameFirst = preferences.getBoolean(KEY_NAME_FIRST, true);
final boolean nicknameOnly = preferences.getBoolean(KEY_NICKNAME_ONLY, false);
final boolean displayExtraType = args.getBoolean(EXTRA_SHOW_EXTRA_TYPE, true);
final boolean displayMediaPreview;
if (args.containsKey(EXTRA_SHOW_MEDIA_PREVIEW)) {
displayMediaPreview = args.getBoolean(EXTRA_SHOW_MEDIA_PREVIEW);
@ -88,7 +89,8 @@ public class ViewStatusDialogFragment extends BaseSupportDialogFragment {
displayMediaPreview = preferences.getBoolean(KEY_MEDIA_PREVIEW, false);
}
mHolder.displayStatus(activity, loader, handler, twitter, displayMediaPreview, true,
true, nameFirst, nicknameOnly, profileImageStyle, mediaPreviewStyle, status, null);
true, nameFirst, nicknameOnly, profileImageStyle, mediaPreviewStyle, status, null,
displayExtraType);
mStatusContainer.findViewById(R.id.item_menu).setVisibility(View.GONE);
mStatusContainer.findViewById(R.id.action_buttons).setVisibility(View.GONE);
}

6
twidere/src/main/java/org/mariotaku/twidere/loader/support/ExtendedCursorLoader.java
View File

@ -30,8 +30,6 @@ import org.mariotaku.twidere.loader.iface.IExtendedLoader;
*/
public class ExtendedCursorLoader extends CursorLoader implements IExtendedLoader {
private boolean mFromUser;
public ExtendedCursorLoader(Context context) {
super(context);
}
@ -43,12 +41,12 @@ public class ExtendedCursorLoader extends CursorLoader implements IExtendedLoade
@Override
public boolean isFromUser() {
return mFromUser;
return true;
}
@Override
public void setFromUser(boolean fromUser) {
mFromUser = fromUser;
//No-op
}
}

1
twidere/src/main/java/org/mariotaku/twidere/preference/ComponentStatePreference.java
View File

@ -25,6 +25,7 @@ public class ComponentStatePreference extends CheckBoxPreference {
super(context, attrs, defStyle);
final TypedArray a = context.obtainStyledAttributes(attrs, new int[] { android.R.attr.name });
final String name = a.getString(0);
a.recycle();
if (name == null) throw new NullPointerException();
mPackageManager = context.getPackageManager();
mComponentName = new ComponentName(context.getPackageName(), name);

1
twidere/src/main/java/org/mariotaku/twidere/util/AsyncTwitterWrapper.java
View File

@ -2122,6 +2122,7 @@ public class AsyncTwitterWrapper extends TwitterWrapper {
final boolean truncated = truncateStatuses(getStatuses(twitter, paging), statuses, sinceId);
storeStatus(accountId, statuses, maxId, truncated, true);
} catch (final TwitterException e) {
Log.w(LOGTAG, e);
result.add(new StatusListResponse(accountId, e));
}
idx++;

2
twidere/src/main/java/org/mariotaku/twidere/util/net/TwidereHostAddressResolver.java
View File

@ -141,7 +141,7 @@ public class TwidereHostAddressResolver implements Constants, HostAddressResolve
lookup.run();
final int result = lookup.getResult();
if (result != Lookup.SUCCESSFUL) {
throw new IOException("Could not find " + host);
throw new UnknownHostException("Unable to resolve " + host + ", " + lookup.getErrorString());
}
records = lookup.getAnswers();
final ArrayList<InetAddress> resolvedAddresses = new ArrayList<>();

1
twidere/src/main/java/org/mariotaku/twidere/view/BadgeView.java
View File

@ -35,6 +35,7 @@ public class BadgeView extends View {
new int[]{android.R.attr.textColor, android.R.attr.text});
setColor(a.getColor(0, Color.WHITE));
setText(a.getString(1));
a.recycle();
mTextPaint.setTextAlign(Align.CENTER);
mTextBounds = new Rect();
}

1
twidere/src/main/java/org/mariotaku/twidere/view/TwidereToolbar.java
View File

@ -44,6 +44,7 @@ public class TwidereToolbar extends Toolbar {
super(getThemedContext(context, attrs, defStyleAttr), attrs, defStyleAttr);
final TypedArray a = getContext().obtainStyledAttributes(attrs, new int[]{R.attr.elevation}, defStyleAttr, 0);
ViewCompat.setElevation(this, a.getDimension(0, 0));
a.recycle();
}
private static Context getThemedContext(Context context, AttributeSet attrs, int defStyleAttr) {

1
twidere/src/main/java/org/mariotaku/twidere/view/holder/MessageConversationViewHolder.java
View File

@ -63,6 +63,7 @@ public class MessageConversationViewHolder extends ViewHolder {
textColorPrimaryInverse = a.getColor(1, 0);
textColorSecondary = a.getColor(2, 0);
textColorSecondaryInverse = a.getColor(3, 0);
a.recycle();
messageContent = (MessageBubbleView) itemView.findViewById(R.id.message_content);
text = (TextView) itemView.findViewById(R.id.text);
time = (TextView) itemView.findViewById(R.id.time);

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

@ -103,7 +103,7 @@ public class StatusViewHolder extends RecyclerView.ViewHolder implements OnClick
adapter.isMediaPreviewEnabled(), adapter.shouldShowAccountsColor(),
displayInReplyTo, adapter.isNameFirst(), adapter.isNicknameOnly(),
adapter.getProfileImageStyle(), adapter.getMediaPreviewStyle(),
status, null);
status, null, displayInReplyTo);
}
public void displayStatus(@NonNull final Context context,
@ -114,7 +114,7 @@ public class StatusViewHolder extends RecyclerView.ViewHolder implements OnClick
final boolean displayInReplyTo, boolean nameFirst, boolean nicknameOnly,
final int profileImageStyle, final int mediaPreviewStyle,
@NonNull final ParcelableStatus status,
@Nullable final TranslationResult translation) {
@Nullable final TranslationResult translation, boolean shouldDisplayExtraType) {
final ParcelableMedia[] media = status.media;
replyRetweetIcon.setColorFilter(replyRetweetView.getCurrentTextColor(), Mode.SRC_ATOP);
@ -217,7 +217,11 @@ public class StatusViewHolder extends RecyclerView.ViewHolder implements OnClick
} else {
favoriteCountView.setText(null);
}
displayExtraTypeIcon(status.card_name, status.media, status.location);
if (shouldDisplayExtraType) {
displayExtraTypeIcon(status.card_name, status.media, status.location);
} else {
extraTypeView.setVisibility(View.GONE);
}
}
public void displayStatus(@NonNull Cursor cursor, @NonNull CursorIndices indices,

1
twidere/src/main/res/layout/adapter_item_media_status.xml
View File

@ -43,7 +43,6 @@
android:id="@+id/media_image"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:scaleType="centerCrop"/>
<ProgressBar

2
twidere/src/main/res/layout/card_item_status_common.xml
View File

@ -189,7 +189,7 @@
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/profile_container"
android:layout_below="@id/media_preview_container"
android:layout_marginBottom="@dimen/element_spacing_xsmall"
android:layout_marginBottom="@dimen/element_spacing_small"
android:layout_marginTop="@dimen/element_spacing_normal"
android:paddingLeft="@dimen/element_spacing_normal"
android:paddingRight="@dimen/element_spacing_normal"