admin/jellyfin-androidtv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove TvApp from getting strings

Browse Source
This commit is contained in:
linetrimmer
2021-06-19 05:32:05 -04:00
parent 2b1fc67963
commit a56a31f588
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/jellyfin/androidtv/ui/itemhandling/BaseRowItem.java
View File

@@ -344,7 +344,7 @@ public class BaseRowItem {
return (searchHint.getSeries() != null ? searchHint.getSeries() + " - " : "") + searchHint.getName();
}
return TvApp.getApplication().getString(R.string.lbl_bracket_unknown);
return context.getString(R.string.lbl_bracket_unknown);
}
public String getName(Context context) {
@@ -371,7 +371,7 @@ public class BaseRowItem {
return seriesTimerInfo.getName();
}
return TvApp.getApplication().getString(R.string.lbl_bracket_unknown);
return context.getString(R.string.lbl_bracket_unknown);
}
public String getItemId() {
@@ -423,7 +423,7 @@ public class BaseRowItem {
+ android.text.format.DateFormat.getTimeFormat(TvApp.getApplication()).format(TimeUtils.convertToLocalDate(baseItem.getEndDate())));
case User:
Date date = user.getLastActivityDate();
return date != null ? DateUtils.getRelativeTimeSpanString(TimeUtils.convertToLocalDate(date).getTime()).toString() : TvApp.getApplication().getString(R.string.lbl_never);
return date != null ? DateUtils.getRelativeTimeSpanString(TimeUtils.convertToLocalDate(date).getTime()).toString() : context.getString(R.string.lbl_never);
case SearchHint:
return searchHint.getType();
case SeriesTimer:

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

@@ -12,7 +12,6 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import org.jellyfin.androidtv.R;
import org.jellyfin.androidtv.TvApp;
import org.jellyfin.androidtv.preference.UserPreferences;
import org.jellyfin.androidtv.preference.constant.RatingType;
import org.jellyfin.androidtv.ui.itemhandling.BaseRowItem;
@@ -219,9 +218,9 @@ public class InfoLayoutHelper {
private static void addSeasonEpisode(Activity activity, BaseItemDto item, LinearLayout layout) {
if (item.getIndexNumber() != null) {
String text = (item.getParentIndexNumber() != null ? TvApp.getApplication().getString(R.string.lbl_season_number, item.getParentIndexNumber()) : "")
+ (item.getIndexNumberEnd() != null && item.getIndexNumber() != null ? " " + TvApp.getApplication().getString(R.string.lbl_episode_range, item.getIndexNumber(), item.getIndexNumberEnd())
: item.getIndexNumber() != null ? " " + TvApp.getApplication().getString(R.string.lbl_episode_number, item.getIndexNumber()) : "")
String text = (item.getParentIndexNumber() != null ? activity.getString(R.string.lbl_season_number, item.getParentIndexNumber()) : "")
+ (item.getIndexNumberEnd() != null && item.getIndexNumber() != null ? " " + activity.getString(R.string.lbl_episode_range, item.getIndexNumber(), item.getIndexNumberEnd())
: item.getIndexNumber() != null ? " " + activity.getString(R.string.lbl_episode_number, item.getIndexNumber()) : "")
+ " ";
TextView time = new TextView(activity);
time.setTextSize(textSize);