correctly applies 'i want my starts back' options for activities - fixed #253
This commit is contained in:
parent
6752f2d1d8
commit
95c976a741
|
@ -70,35 +70,22 @@ public abstract class AbsActivitiesAdapter<Data> extends LoadMoreSupportAdapter<
|
||||||
private final LayoutInflater mInflater;
|
private final LayoutInflater mInflater;
|
||||||
private final MediaLoadingHandler mLoadingHandler;
|
private final MediaLoadingHandler mLoadingHandler;
|
||||||
private final int mCardBackgroundColor;
|
private final int mCardBackgroundColor;
|
||||||
private final int mTextSize;
|
|
||||||
private final int mProfileImageStyle, mMediaPreviewStyle, mLinkHighlightingStyle;
|
|
||||||
private final boolean mCompactCards;
|
private final boolean mCompactCards;
|
||||||
private final boolean mDisplayMediaPreview;
|
|
||||||
private final boolean mNameFirst;
|
|
||||||
private final boolean mDisplayProfileImage;
|
|
||||||
private final boolean mShouldUseStarsForLikes;
|
|
||||||
private final TwidereLinkify mLinkify;
|
private final TwidereLinkify mLinkify;
|
||||||
private final DummyStatusHolderAdapter mStatusAdapterDelegate;
|
private final DummyStatusHolderAdapter mStatusAdapterDelegate;
|
||||||
private ActivityAdapterListener mActivityAdapterListener;
|
private ActivityAdapterListener mActivityAdapterListener;
|
||||||
|
|
||||||
protected AbsActivitiesAdapter(final Context context, boolean compact) {
|
protected AbsActivitiesAdapter(final Context context, boolean compact) {
|
||||||
super(context);
|
super(context);
|
||||||
|
mStatusAdapterDelegate = new DummyStatusHolderAdapter(context);
|
||||||
mCardBackgroundColor = ThemeUtils.getCardBackgroundColor(context,
|
mCardBackgroundColor = ThemeUtils.getCardBackgroundColor(context,
|
||||||
ThemeUtils.getThemeBackgroundOption(context),
|
ThemeUtils.getThemeBackgroundOption(context),
|
||||||
ThemeUtils.getUserThemeBackgroundAlpha(context));
|
ThemeUtils.getUserThemeBackgroundAlpha(context));
|
||||||
mInflater = LayoutInflater.from(context);
|
mInflater = LayoutInflater.from(context);
|
||||||
mLoadingHandler = new MediaLoadingHandler(R.id.media_preview_progress);
|
mLoadingHandler = new MediaLoadingHandler(R.id.media_preview_progress);
|
||||||
mTextSize = mPreferences.getInt(KEY_TEXT_SIZE, context.getResources().getInteger(R.integer.default_text_size));
|
|
||||||
mShouldUseStarsForLikes = mPreferences.getBoolean(KEY_I_WANT_MY_STARS_BACK);
|
|
||||||
mCompactCards = compact;
|
mCompactCards = compact;
|
||||||
mProfileImageStyle = Utils.getProfileImageStyle(mPreferences.getString(KEY_PROFILE_IMAGE_STYLE, null));
|
|
||||||
mMediaPreviewStyle = Utils.getMediaPreviewStyle(mPreferences.getString(KEY_MEDIA_PREVIEW_STYLE, null));
|
|
||||||
mLinkHighlightingStyle = Utils.getLinkHighlightingStyleInt(mPreferences.getString(KEY_LINK_HIGHLIGHT_OPTION, null));
|
|
||||||
mDisplayProfileImage = mPreferences.getBoolean(KEY_DISPLAY_PROFILE_IMAGE, true);
|
|
||||||
mDisplayMediaPreview = mPreferences.getBoolean(KEY_MEDIA_PREVIEW, false);
|
|
||||||
mNameFirst = mPreferences.getBoolean(KEY_NAME_FIRST, true);
|
|
||||||
mLinkify = new TwidereLinkify(this);
|
mLinkify = new TwidereLinkify(this);
|
||||||
mStatusAdapterDelegate = new DummyStatusHolderAdapter(context);
|
mStatusAdapterDelegate.updateOptions();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -125,12 +112,12 @@ public abstract class AbsActivitiesAdapter<Data> extends LoadMoreSupportAdapter<
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getProfileImageStyle() {
|
public int getProfileImageStyle() {
|
||||||
return mProfileImageStyle;
|
return mStatusAdapterDelegate.getProfileImageStyle();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public int getMediaPreviewStyle() {
|
public int getMediaPreviewStyle() {
|
||||||
return mMediaPreviewStyle;
|
return mStatusAdapterDelegate.getMediaPreviewStyle();
|
||||||
}
|
}
|
||||||
|
|
||||||
@NonNull
|
@NonNull
|
||||||
|
@ -141,11 +128,11 @@ public abstract class AbsActivitiesAdapter<Data> extends LoadMoreSupportAdapter<
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public float getTextSize() {
|
public float getTextSize() {
|
||||||
return mTextSize;
|
return mStatusAdapterDelegate.getTextSize();
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getLinkHighlightingStyle() {
|
public int getLinkHighlightingStyle() {
|
||||||
return mLinkHighlightingStyle;
|
return mStatusAdapterDelegate.getLinkHighlightingStyle();
|
||||||
}
|
}
|
||||||
|
|
||||||
public TwidereLinkify getLinkify() {
|
public TwidereLinkify getLinkify() {
|
||||||
|
@ -153,12 +140,12 @@ public abstract class AbsActivitiesAdapter<Data> extends LoadMoreSupportAdapter<
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isNameFirst() {
|
public boolean isNameFirst() {
|
||||||
return mNameFirst;
|
return mStatusAdapterDelegate.isNameFirst();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isProfileImageEnabled() {
|
public boolean isProfileImageEnabled() {
|
||||||
return mDisplayProfileImage;
|
return mStatusAdapterDelegate.isProfileImageEnabled();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -180,7 +167,7 @@ public abstract class AbsActivitiesAdapter<Data> extends LoadMoreSupportAdapter<
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean shouldUseStarsForLikes() {
|
public boolean shouldUseStarsForLikes() {
|
||||||
return mShouldUseStarsForLikes;
|
return mStatusAdapterDelegate.shouldUseStarsForLikes();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -220,7 +207,7 @@ public abstract class AbsActivitiesAdapter<Data> extends LoadMoreSupportAdapter<
|
||||||
cardView.setCardBackgroundColor(mCardBackgroundColor);
|
cardView.setCardBackgroundColor(mCardBackgroundColor);
|
||||||
}
|
}
|
||||||
final StatusViewHolder holder = new StatusViewHolder(mStatusAdapterDelegate, view);
|
final StatusViewHolder holder = new StatusViewHolder(mStatusAdapterDelegate, view);
|
||||||
holder.setTextSize(getTextSize());
|
holder.setupViewOptions();
|
||||||
holder.setStatusClickListener(this);
|
holder.setStatusClickListener(this);
|
||||||
return holder;
|
return holder;
|
||||||
}
|
}
|
||||||
|
@ -363,7 +350,7 @@ public abstract class AbsActivitiesAdapter<Data> extends LoadMoreSupportAdapter<
|
||||||
protected abstract int getActivityAction(int position);
|
protected abstract int getActivityAction(int position);
|
||||||
|
|
||||||
private boolean isMediaPreviewEnabled() {
|
private boolean isMediaPreviewEnabled() {
|
||||||
return mDisplayMediaPreview;
|
return mStatusAdapterDelegate.isMediaPreviewEnabled();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -691,6 +691,7 @@ public class StatusViewHolder extends ViewHolder implements Constants, OnClickLi
|
||||||
sensitiveContentEnabled = preferences.getBoolean(KEY_DISPLAY_SENSITIVE_CONTENTS, false);
|
sensitiveContentEnabled = preferences.getBoolean(KEY_DISPLAY_SENSITIVE_CONTENTS, false);
|
||||||
hideCardActions = preferences.getBoolean(KEY_HIDE_CARD_ACTIONS, false);
|
hideCardActions = preferences.getBoolean(KEY_HIDE_CARD_ACTIONS, false);
|
||||||
linkHighlightStyle = Utils.getLinkHighlightingStyleInt(preferences.getString(KEY_LINK_HIGHLIGHT_OPTION, null));
|
linkHighlightStyle = Utils.getLinkHighlightingStyleInt(preferences.getString(KEY_LINK_HIGHLIGHT_OPTION, null));
|
||||||
|
useStarsForLikes = preferences.getBoolean(KEY_I_WANT_MY_STARS_BACK);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue