jellyfin/jellyfin-androidtv
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-androidtv.git synced 2025-02-17 05:20:14 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Enable nonTransitiveRClass

Browse Source
This commit is contained in:
Niels van Velzen 2023-04-13 22:26:49 +02:00 committed by Niels van Velzen
parent f77e281142
commit c1dba246c8
12 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/jellyfin/androidtv/ui/FriendlyDateButton.java
View File

@ -39,7 +39,7 @@ public class FriendlyDateButton extends FrameLayout {
super.onFocusChanged(gainFocus, direction, previouslyFocusedRect);
if (gainFocus) {
setBackgroundColor(getResources().getColor(R.color.lb_default_brand_color));
setBackgroundColor(getResources().getColor(androidx.leanback.R.color.lb_default_brand_color));
} else {
setBackgroundColor(0);
}

2
app/src/main/java/org/jellyfin/androidtv/ui/ProgramGridCell.java
View File

@ -82,7 +82,7 @@ public class ProgramGridCell extends RelativeLayout implements RecordingIndicato
}
if (liveTvPreferences.get(LiveTvPreferences.Companion.getShowRepeatIndicator()) && Utils.isTrue(program.getIsRepeat())) {
InfoLayoutHelper.addBlockText(context, mInfoRow, context.getString(R.string.lbl_repeat), 10, Color.GRAY, R.color.lb_default_brand_color);
InfoLayoutHelper.addBlockText(context, mInfoRow, context.getString(R.string.lbl_repeat), 10, Color.GRAY, androidx.leanback.R.color.lb_default_brand_color);
}
if (program.getOfficialRating() != null && !program.getOfficialRating().equals("0")) {

5
app/src/main/java/org/jellyfin/androidtv/ui/browsing/BrowseFolderFragment.kt
View File

@ -19,7 +19,6 @@ import androidx.lifecycle.repeatOnLifecycle
import kotlinx.coroutines.launch
import kotlinx.serialization.decodeFromString
import kotlinx.serialization.json.Json
import org.jellyfin.androidtv.R
import org.jellyfin.androidtv.constant.Extras
import org.jellyfin.androidtv.data.service.BackgroundService
import org.jellyfin.androidtv.preference.UserPreferences
@ -122,10 +121,10 @@ abstract class BrowseFolderFragment : BrowseSupportFragment(), RowLoader {
val showClock = userPreferences[clockBehavior]
if (showClock !== ClockBehavior.ALWAYS && showClock !== ClockBehavior.IN_MENUS) return
val root = requireActivity().findViewById<ViewGroup>(R.id.browse_frame)
val root = requireActivity().findViewById<ViewGroup>(androidx.leanback.R.id.browse_frame)
// Move the title to the left to make way for the clock
val titleView = root.findViewById<TextView>(R.id.title_text)
val titleView = root.findViewById<TextView>(androidx.leanback.R.id.title_text)
if (titleView != null) {
val layoutParams = titleView.layoutParams as FrameLayout.LayoutParams
layoutParams.rightMargin = convertDpToPixel(root.context, 120)

2
app/src/main/java/org/jellyfin/androidtv/ui/card/LegacyImageCardView.java
View File

@ -35,7 +35,7 @@ public class LegacyImageCardView extends BaseCardView {
private NumberFormat nf = NumberFormat.getInstance();
public LegacyImageCardView(Context context, boolean showInfo) {
super(context, null, R.attr.imageCardViewStyle);
super(context, null, androidx.leanback.R.attr.imageCardViewStyle);
if (!showInfo) {
setCardType(CARD_TYPE_MAIN_ONLY);

10
app/src/main/java/org/jellyfin/androidtv/ui/playback/CustomPlaybackOverlayFragment.java
View File

@ -274,10 +274,10 @@ public class CustomPlaybackOverlayFragment extends Fragment implements LiveTvGui
}
//pre-load animations
fadeOut = AnimationUtils.loadAnimation(requireContext(), R.anim.abc_fade_out);
fadeOut = AnimationUtils.loadAnimation(requireContext(), androidx.leanback.R.anim.abc_fade_out);
fadeOut.setAnimationListener(hideAnimationListener);
slideDown = AnimationUtils.loadAnimation(requireContext(), R.anim.abc_slide_in_top);
slideUp = AnimationUtils.loadAnimation(requireContext(), R.anim.abc_slide_in_bottom);
slideDown = AnimationUtils.loadAnimation(requireContext(), androidx.leanback.R.anim.abc_slide_in_top);
slideUp = AnimationUtils.loadAnimation(requireContext(), androidx.leanback.R.anim.abc_slide_in_bottom);
slideDown.setAnimationListener(showAnimationListener);
setupPopupAnimations();
@ -345,7 +345,7 @@ public class CustomPlaybackOverlayFragment extends Fragment implements LiveTvGui
}
private void setupPopupAnimations() {
showPopup = AnimationUtils.loadAnimation(requireContext(), R.anim.abc_slide_in_bottom);
showPopup = AnimationUtils.loadAnimation(requireContext(), androidx.leanback.R.anim.abc_slide_in_bottom);
showPopup.setAnimationListener(new Animation.AnimationListener() {
@Override
public void onAnimationStart(Animation animation) {
@ -361,7 +361,7 @@ public class CustomPlaybackOverlayFragment extends Fragment implements LiveTvGui
public void onAnimationRepeat(Animation animation) {
}
});
hidePopup = AnimationUtils.loadAnimation(requireContext(), R.anim.abc_fade_out);
hidePopup = AnimationUtils.loadAnimation(requireContext(), androidx.leanback.R.anim.abc_fade_out);
hidePopup.setAnimationListener(new Animation.AnimationListener() {
@Override
public void onAnimationStart(Animation animation) {

2
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/ButtonRemapDialogFragment.kt
View File

@ -68,7 +68,7 @@ class ButtonRemapDialogFragment : LeanbackPreferenceDialogFragmentCompat() {
}
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
val styledContext = ContextThemeWrapper(activity, R.style.PreferenceThemeOverlayLeanback)
val styledContext = ContextThemeWrapper(activity, androidx.leanback.preference.R.style.PreferenceThemeOverlayLeanback)
val styledInflater = inflater.cloneInContext(styledContext)
binding = PreferenceButtonRemapBinding.inflate(styledInflater, container, false)

2
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/ColorPickerDialogFragment.kt
View File

@ -43,7 +43,7 @@ class ColorPickerDialogFragment : LeanbackPreferenceDialogFragmentCompat() {
}
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
val styledContext = ContextThemeWrapper(activity, R.style.PreferenceThemeOverlayLeanback)
val styledContext = ContextThemeWrapper(activity, androidx.leanback.preference.R.style.PreferenceThemeOverlayLeanback)
val styledInflater = inflater.cloneInContext(styledContext)
binding = PreferenceColorListBinding.inflate(styledInflater, container, false)

3
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/DurationSeekBarPreference.kt
View File

@ -8,7 +8,6 @@ import android.view.View
import android.widget.TextView
import androidx.preference.PreferenceViewHolder
import androidx.preference.SeekBarPreference
import org.jellyfin.androidtv.R
class DurationSeekBarPreference @JvmOverloads constructor(
context: Context,
@ -21,7 +20,7 @@ class DurationSeekBarPreference @JvmOverloads constructor(
override fun onBindViewHolder(view: PreferenceViewHolder) {
super.onBindViewHolder(view)
val textView = view.findViewById(R.id.seekbar_value) as TextView
val textView = view.findViewById(androidx.leanback.preference.R.id.seekbar_value) as TextView
textView.transformationMethod = object : TransformationMethod {
override fun onFocusChanged(view: View, sourceText: CharSequence?, focused: Boolean, direction: Int, previouslyFocusedRect: Rect) {}

2
app/src/main/java/org/jellyfin/androidtv/ui/preference/custom/RichListDialogFragment.kt
View File

@ -49,7 +49,7 @@ class RichListDialogFragment : LeanbackPreferenceDialogFragmentCompat() {
}
public override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
val styledContext = ContextThemeWrapper(activity, R.style.PreferenceThemeOverlayLeanback)
val styledContext = ContextThemeWrapper(activity, androidx.leanback.preference.R.style.PreferenceThemeOverlayLeanback)
val styledInflater = inflater.cloneInContext(styledContext)
binding = PreferenceRichListBinding.inflate(styledInflater, container, false)

4
app/src/main/java/org/jellyfin/androidtv/util/InfoLayoutHelper.java
View File

@ -176,11 +176,11 @@ public class InfoLayoutHelper {
addBlockText(context, layout, context.getString(R.string.lbl_new), 12, Color.GRAY, R.drawable.dark_green_gradient);
addSpacer(context, layout, " ");
} else if (Utils.isTrue(item.isSeries()) && !Utils.isTrue(item.isNews())) {
addBlockText(context, layout, context.getString(R.string.lbl_repeat), 12, Color.GRAY, R.color.lb_default_brand_color);
addBlockText(context, layout, context.getString(R.string.lbl_repeat), 12, Color.GRAY, androidx.leanback.R.color.lb_default_brand_color);
addSpacer(context, layout, " ");
}
if (Utils.isTrue(item.isLive())) {
addBlockText(context, layout, context.getString(R.string.lbl_live), 12, Color.GRAY, R.color.lb_default_brand_color);
addBlockText(context, layout, context.getString(R.string.lbl_live), 12, Color.GRAY, androidx.leanback.R.color.lb_default_brand_color);
addSpacer(context, layout, " ");
}

1
app/src/main/res/values/strings.xml
View File

@ -489,6 +489,7 @@
<string name="pref_screensaver_inapp_enabled_description">Show the Jellyfin screensaver while the app is open</string>
<string name="pref_screensaver_inapp_timeout">Start screensaver after</string>
<string name="enable_reactive_homepage">Enable reactive homepage</string>
<string name="not_set">Not set</string>
<plurals name="seconds">
<item quantity="one">%1$s second</item>
<item quantity="other">%1$s seconds</item>

2
gradle.properties
View File

@ -10,8 +10,6 @@ sdk.version=default
# Android
android.useAndroidX=true
# FIXME: Remove this once all uses of R have correct imports
android.nonTransitiveRClass=false
# Enable LeakCanary
leakcanary.enable=false