Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use ContextCompat and ResourcesCompat for retrieving drawables #592

Merged
merged 1 commit into from
Oct 7, 2020
Merged

Use ContextCompat and ResourcesCompat for retrieving drawables #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions app/src/main/java/org/jellyfin/androidtv/TvApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,6 @@ public boolean canManageRecordings() {
return currentUser != null && currentUser.getPolicy().getEnableLiveTvManagement();
}

public Drawable getDrawableCompat(int id) {
return ContextCompat.getDrawable(this, id);
}

public DisplayPreferences getCachedDisplayPrefs(String key) {
return displayPrefsCache.containsKey(key) ? displayPrefsCache.get(key) : new DisplayPreferences();
}
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/java/org/jellyfin/androidtv/integration/ChannelManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import android.content.Context
import android.content.Intent
import android.net.Uri
import android.os.Build
import androidx.core.content.res.ResourcesCompat
import androidx.core.graphics.drawable.toBitmap
import androidx.tvprovider.media.tv.Channel
import androidx.tvprovider.media.tv.ChannelLogoUtils
Expand Down Expand Up @@ -93,7 +94,9 @@ class ChannelManager : KoinComponent {
}

// Update logo
ChannelLogoUtils.storeChannelLogo(application, ContentUris.parseId(uri), application.resources.getDrawable(R.drawable.ic_jellyfin, null).toBitmap(80.dp, 80.dp))
ResourcesCompat.getDrawable(application.resources, R.drawable.ic_jellyfin, null)?.let {
ChannelLogoUtils.storeChannelLogo(application, ContentUris.parseId(uri), it.toBitmap(80.dp, 80.dp))
}

return uri
}
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/org/jellyfin/androidtv/ui/ExpandableTextView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@ import android.content.Intent
import android.util.AttributeSet
import androidx.appcompat.widget.AppCompatTextView
import androidx.core.app.ActivityOptionsCompat
import androidx.core.content.ContextCompat
import org.jellyfin.androidtv.R
import org.jellyfin.androidtv.TvApp
import org.jellyfin.androidtv.ui.itemdetail.ExpandedTextActivity
import org.jellyfin.androidtv.util.getActivity

class ExpandableTextView(context: Context, attrs: AttributeSet?) : AppCompatTextView(context, attrs) {
init {
background = context.getDrawable(R.drawable.expanded_text)
background = ContextCompat.getDrawable(context, R.drawable.expanded_text)
transitionName = ExpandedTextActivity.TRANSITION_NAME

setOnClickListener {
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/org/jellyfin/androidtv/ui/GuideChannelHeader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
import android.widget.RelativeLayout;
import android.widget.TextView;

import androidx.core.content.ContextCompat;

import com.bumptech.glide.Glide;

import org.jellyfin.androidtv.R;
Expand Down Expand Up @@ -82,7 +84,7 @@ protected void onFocusChanged(boolean gainFocus, int direction, Rect previouslyF

mTvGuide.setSelectedProgram(this);
} else {
setBackground(getResources().getDrawable(R.drawable.light_border));
setBackground(ContextCompat.getDrawable(getContext(), R.drawable.light_border));
}
}

Expand Down
8 changes: 5 additions & 3 deletions app/src/main/java/org/jellyfin/androidtv/ui/LiveProgramDetailPopup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,13 @@
import android.widget.PopupWindow;
import android.widget.TextView;

import androidx.core.content.ContextCompat;

import org.jellyfin.androidtv.R;
import org.jellyfin.androidtv.TvApp;
import org.jellyfin.androidtv.ui.livetv.ILiveTvGuide;
import org.jellyfin.androidtv.ui.shared.BaseActivity;
import org.jellyfin.androidtv.ui.livetv.TvManager;
import org.jellyfin.androidtv.ui.shared.BaseActivity;
import org.jellyfin.androidtv.util.InfoLayoutHelper;
import org.jellyfin.androidtv.util.TimeUtils;
import org.jellyfin.androidtv.util.Utils;
Expand Down Expand Up @@ -356,7 +358,7 @@ public void onClick(View v) {
@Override
public void onResponse(UserItemDataDto response) {
channel.setUserData(response);
fave.setImageDrawable(mActivity.getResources().getDrawable(response.getIsFavorite() ? R.drawable.ic_heart_red : R.drawable.ic_heart));
fave.setImageDrawable(ContextCompat.getDrawable(mActivity, response.getIsFavorite() ? R.drawable.ic_heart_red : R.drawable.ic_heart));
mTvGuide.refreshFavorite(channel.getId());
TvApp.getApplication().dataRefreshService.setLastFavoriteUpdate(System.currentTimeMillis());
}
Expand All @@ -369,7 +371,7 @@ public void onResponse(UserItemDataDto response) {

private android.widget.ImageButton addImgButton(LinearLayout layout, int imgResource) {
android.widget.ImageButton btn = new android.widget.ImageButton(mActivity);
btn.setImageDrawable(mActivity.getResources().getDrawable(imgResource));
btn.setImageDrawable(ContextCompat.getDrawable(mActivity, imgResource));
btn.setBackgroundResource(R.drawable.jellyfin_button);
layout.addView(btn);
return btn;
Expand Down
38 changes: 20 additions & 18 deletions app/src/main/java/org/jellyfin/androidtv/ui/browsing/StdBrowseFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,34 @@
import android.widget.ImageView;
import android.widget.TextView;

import androidx.core.content.ContextCompat;
import androidx.leanback.app.BackgroundManager;
import androidx.leanback.app.BrowseSupportFragment;
import androidx.leanback.widget.ArrayObjectAdapter;
import androidx.leanback.widget.HeaderItem;
import androidx.leanback.widget.ListRow;
import androidx.leanback.widget.OnItemViewClickedListener;
import androidx.leanback.widget.OnItemViewSelectedListener;
import androidx.leanback.widget.Presenter;
import androidx.leanback.widget.Row;
import androidx.leanback.widget.RowPresenter;

import org.jellyfin.androidtv.R;
import org.jellyfin.androidtv.TvApp;
import org.jellyfin.androidtv.ui.shared.BaseActivity;
import org.jellyfin.androidtv.constant.CustomMessage;
import org.jellyfin.androidtv.ui.shared.IKeyListener;
import org.jellyfin.androidtv.ui.shared.IMessageListener;
import org.jellyfin.androidtv.constant.QueryType;
import org.jellyfin.androidtv.data.querying.ViewQuery;
import org.jellyfin.androidtv.preference.UserPreferences;
import org.jellyfin.androidtv.ui.ClockUserView;
import org.jellyfin.androidtv.ui.itemhandling.BaseRowItem;
import org.jellyfin.androidtv.ui.itemhandling.ItemLauncher;
import org.jellyfin.androidtv.ui.itemhandling.ItemRowAdapter;
import org.jellyfin.androidtv.preference.UserPreferences;
import org.jellyfin.androidtv.ui.presentation.CardPresenter;
import org.jellyfin.androidtv.ui.presentation.PositionableListRowPresenter;
import org.jellyfin.androidtv.constant.QueryType;
import org.jellyfin.androidtv.data.querying.ViewQuery;
import org.jellyfin.androidtv.ui.search.SearchActivity;
import org.jellyfin.androidtv.ui.ClockUserView;
import org.jellyfin.androidtv.ui.shared.BaseActivity;
import org.jellyfin.androidtv.ui.shared.IKeyListener;
import org.jellyfin.androidtv.ui.shared.IMessageListener;
import org.jellyfin.androidtv.util.BackgroundManagerExtensionsKt;
import org.jellyfin.androidtv.util.KeyProcessor;
import org.jellyfin.androidtv.util.Utils;
Expand All @@ -53,16 +65,6 @@
import java.util.Timer;
import java.util.TimerTask;

import androidx.leanback.app.BackgroundManager;
import androidx.leanback.app.BrowseSupportFragment;
import androidx.leanback.widget.ArrayObjectAdapter;
import androidx.leanback.widget.HeaderItem;
import androidx.leanback.widget.ListRow;
import androidx.leanback.widget.OnItemViewClickedListener;
import androidx.leanback.widget.OnItemViewSelectedListener;
import androidx.leanback.widget.Presenter;
import androidx.leanback.widget.Row;
import androidx.leanback.widget.RowPresenter;
import timber.log.Timber;

import static org.koin.java.KoinJavaComponent.get;
Expand Down Expand Up @@ -244,7 +246,7 @@ private void prepareBackgroundManager() {
}

protected void setupUIElements() {
if (ShowBadge) setBadgeDrawable(getActivity().getResources().getDrawable(R.drawable.app_logo_transparent));
if (ShowBadge) setBadgeDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.app_logo_transparent));
setTitle(MainTitle); // Badge, when set, takes precedent over title
setHeadersState(HEADERS_ENABLED);
setHeadersTransitionOnBackEnabled(true);
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/org/jellyfin/androidtv/ui/itemdetail/FullDetailsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import android.view.View;
import android.widget.PopupMenu;

import androidx.core.content.ContextCompat;
import androidx.leanback.app.BackgroundManager;
import androidx.leanback.app.RowsSupportFragment;
import androidx.leanback.widget.ArrayObjectAdapter;
Expand Down Expand Up @@ -477,7 +478,7 @@ protected void onPostExecute(MyDetailsOverviewRow detailsOverviewRow) {

ClassPresenterSelector ps = new ClassPresenterSelector();
ps.addClassPresenter(MyDetailsOverviewRow.class, mDorPresenter);
mListRowPresenter = new CustomListRowPresenter(getDrawable(R.color.black_transparent_light), Utils.convertDpToPixel(mActivity, 10));
mListRowPresenter = new CustomListRowPresenter(ContextCompat.getDrawable(mActivity, R.color.black_transparent_light), Utils.convertDpToPixel(mActivity, 10));
ps.addClassPresenter(ListRow.class, mListRowPresenter);
mRowsAdapter = new ArrayObjectAdapter(ps);
mRowsFragment.setAdapter(mRowsAdapter);
Expand Down
12 changes: 7 additions & 5 deletions app/src/main/java/org/jellyfin/androidtv/ui/itemhandling/BaseRowItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import android.graphics.drawable.Drawable;
import android.text.format.DateUtils;

import androidx.core.content.ContextCompat;

import org.jellyfin.androidtv.R;
import org.jellyfin.androidtv.TvApp;
import org.jellyfin.androidtv.data.model.ChapterItemInfo;
Expand Down Expand Up @@ -518,28 +520,28 @@ public Drawable getBadgeImage() {
switch (type) {
case BaseItem:
if (baseItem.getBaseItemType() == BaseItemType.Movie && baseItem.getCriticRating() != null) {
return baseItem.getCriticRating() > 59 ? TvApp.getApplication().getDrawableCompat(R.drawable.fresh) : TvApp.getApplication().getDrawableCompat(R.drawable.rotten);
return baseItem.getCriticRating() > 59 ? ContextCompat.getDrawable(TvApp.getApplication(), R.drawable.fresh) : ContextCompat.getDrawable(TvApp.getApplication(), R.drawable.rotten);
} else if (baseItem.getBaseItemType() == BaseItemType.Program && baseItem.getTimerId() != null) {
return baseItem.getSeriesTimerId() != null ? TvApp.getApplication().getDrawableCompat(R.drawable.ic_record_series_red) : TvApp.getApplication().getDrawableCompat(R.drawable.ic_record_red);
return baseItem.getSeriesTimerId() != null ? ContextCompat.getDrawable(TvApp.getApplication(), R.drawable.ic_record_series_red) : ContextCompat.getDrawable(TvApp.getApplication(), R.drawable.ic_record_red);
}
break;
case Person:
case Server:
break;
case User:
if (user.getHasPassword()) {
return TvApp.getApplication().getDrawableCompat(R.drawable.ic_lock);
return ContextCompat.getDrawable(TvApp.getApplication(), R.drawable.ic_lock);
}
break;
case LiveTvProgram:
if (baseItem.getTimerId() != null) {
return baseItem.getSeriesTimerId() != null ? TvApp.getApplication().getDrawableCompat(R.drawable.ic_record_series_red) : TvApp.getApplication().getDrawableCompat(R.drawable.ic_record_red);
return baseItem.getSeriesTimerId() != null ? ContextCompat.getDrawable(TvApp.getApplication(), R.drawable.ic_record_series_red) : ContextCompat.getDrawable(TvApp.getApplication(), R.drawable.ic_record_red);
}
case Chapter:
break;
}

return TvApp.getApplication().getDrawableCompat(R.drawable.blank10x10);
return ContextCompat.getDrawable(TvApp.getApplication(), R.drawable.blank10x10);
}

public void refresh(final EmptyResponse outerResponse) {
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/java/org/jellyfin/androidtv/ui/playback/AudioNowPlayingActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import android.widget.ScrollView;
import android.widget.TextView;

import androidx.core.content.ContextCompat;
import androidx.leanback.app.BackgroundManager;
import androidx.leanback.app.RowsSupportFragment;
import androidx.leanback.widget.ArrayObjectAdapter;
Expand All @@ -34,11 +35,11 @@
import org.jellyfin.androidtv.ui.ClockUserView;
import org.jellyfin.androidtv.ui.GenreButton;
import org.jellyfin.androidtv.ui.ImageButton;
import org.jellyfin.androidtv.ui.shared.BaseActivity;
import org.jellyfin.androidtv.ui.itemdetail.FullDetailsActivity;
import org.jellyfin.androidtv.ui.itemdetail.ItemListActivity;
import org.jellyfin.androidtv.ui.itemhandling.BaseRowItem;
import org.jellyfin.androidtv.ui.presentation.PositionableListRowPresenter;
import org.jellyfin.androidtv.ui.shared.BaseActivity;
import org.jellyfin.androidtv.util.BackgroundManagerExtensionsKt;
import org.jellyfin.androidtv.util.ImageUtils;
import org.jellyfin.androidtv.util.InfoLayoutHelper;
Expand Down Expand Up @@ -249,7 +250,7 @@ public void onClick(View v) {

mRowsFragment.setOnItemViewClickedListener(new ItemViewClickedListener());
mRowsFragment.setOnItemViewSelectedListener(new ItemViewSelectedListener());
mAudioQueuePresenter = new PositionableListRowPresenter(getDrawable(R.color.black_transparent_light), 10);
mAudioQueuePresenter = new PositionableListRowPresenter(ContextCompat.getDrawable(this, R.color.black_transparent_light), 10);
mRowsAdapter = new ArrayObjectAdapter(mAudioQueuePresenter);
mRowsFragment.setAdapter(mRowsAdapter);
addQueue();
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/jellyfin/androidtv/ui/playback/overlay/action/CustomAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import android.graphics.drawable.Drawable;
import android.view.View;

import androidx.core.content.ContextCompat;
import androidx.leanback.widget.PlaybackControlsRow;

import org.jellyfin.androidtv.ui.playback.PlaybackController;
Expand All @@ -27,12 +28,11 @@ public void onCustomActionClicked(View view) { // We need a custom onClicked imp
}

void initializeWithIcon(int resourceId) {
Drawable drawable = context.getDrawable(resourceId);
Drawable drawable = ContextCompat.getDrawable(context, resourceId);
setIcon(drawable);
setDrawables(new Drawable[]{drawable});
}

public void handleClickAction(PlaybackController playbackController, LeanbackOverlayFragment leanbackOverlayFragment, Context context, View view) {

}
}
8 changes: 4 additions & 4 deletions app/src/main/java/org/jellyfin/androidtv/ui/playback/overlay/action/RecordAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import android.content.Context;
import android.graphics.drawable.Drawable;

import androidx.core.content.ContextCompat;

import org.jellyfin.androidtv.R;
import org.jellyfin.androidtv.ui.playback.overlay.CustomPlaybackTransportControlGlue;

Expand All @@ -11,13 +13,11 @@ public class RecordAction extends CustomAction {
public static final int INDEX_INACTIVE = 0;
public static final int INDEX_RECORDING = 1;


public RecordAction(Context context, CustomPlaybackTransportControlGlue customPlaybackTransportControlGlue) {
super(context, customPlaybackTransportControlGlue);
Drawable recordInactive = context.getDrawable(R.drawable.ic_record);
Drawable recordActive = context.getDrawable(R.drawable.ic_record_red);
Drawable recordInactive = ContextCompat.getDrawable(context, R.drawable.ic_record);
Drawable recordActive = ContextCompat.getDrawable(context, R.drawable.ic_record_red);
setIndex(INDEX_INACTIVE);
setDrawables(new Drawable[]{recordInactive, recordActive});

}
}
Loading