nomad/ananas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: strings & naming standard for icon

Browse source
This commit is contained in:
nomadics9 2024-07-20 23:12:12 +03:00
parent 7adcc50d75
commit c79342523b
7 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/phone/src/main/java/dev/jdtech/jellyfin/PlayerActivity.kt
View file

@ -366,7 +366,7 @@ class PlayerActivity : BasePlayerActivity() {
qualities[1] = "${qualities[1]} (${closestQuality})" qualities[1] = "${qualities[1]} (${closestQuality})"
} }
MaterialAlertDialogBuilder(this) MaterialAlertDialogBuilder(this)
.setTitle("Select Video Quality") .setTitle(CoreR.string.select_quality)
.setSingleChoiceItems(qualities.toTypedArray(), selectedIndex) { dialog, which -> .setSingleChoiceItems(qualities.toTypedArray(), selectedIndex) { dialog, which ->
selectedIndex = which selectedIndex = which
val selectedQualityValue = qualityValues[which] val selectedQualityValue = qualityValues[which]

2
app/phone/src/main/res/layout/exo_main_controls.xml
View file

@ -81,7 +81,7 @@
android:background="@drawable/transparent_circle_background" android:background="@drawable/transparent_circle_background"
android:contentDescription="Quality" android:contentDescription="Quality"
android:padding="16dp" android:padding="16dp"
android:src="@drawable/ic_quality" android:src="@drawable/ic_monitor_play"
android:layout_gravity="end" android:layout_gravity="end"
app:tint="@android:color/white" app:tint="@android:color/white"
/> />

2
core/src/main/java/dev/jdtech/jellyfin/utils/DownloaderImpl.kt
View file

@ -86,7 +86,7 @@ class DownloaderImpl(
if (intro != null) { if (intro != null) {
database.insertIntro(intro.toIntroDto(item.id)) database.insertIntro(intro.toIntroDto(item.id))
} }
if (appPreferences.downloadQuality != "Original") { if (appPreferences.downloadQuality != VideoQuality.Original.toString()) {
downloadEmbeddedMediaStreams(item, source, storageIndex) downloadEmbeddedMediaStreams(item, source, storageIndex)
val transcodingUrl = val transcodingUrl =
getTranscodedUrl(item.id, appPreferences.downloadQuality!!) getTranscodedUrl(item.id, appPreferences.downloadQuality!!)

0
core/src/main/res/drawable/ic_quality.xml → core/src/main/res/drawable/ic_monitor_play.xml
View file

22
core/src/main/res/values/string_arrays.xml
View file

@ -26,12 +26,12 @@
<item>opensles</item> <item>opensles</item>
</string-array> </string-array>
<string-array name="quality_entries"> <string-array name="quality_entries">
<item>Auto</item> <item>@string/quality_auto</item>
<item>Original</item> <item>@string/quality_original</item>
<item>1080p - 8Mbps</item> <item>@string/quality_1080p</item>
<item>720p - 3Mbps</item> <item>@string/quality_720p</item>
<item>480p - 1.5Mbps</item> <item>@string/quality_480p</item>
<item>360p - 800Kbps</item> <item>@string/quality_360p</item>
</string-array> </string-array>
<string-array name="quality_values"> <string-array name="quality_values">
<item>Auto</item> <item>Auto</item>
@ -42,11 +42,11 @@
<item>360p</item> <item>360p</item>
</string-array> </string-array>
<string-array name="download_quality_entries"> <string-array name="download_quality_entries">
<item>Original</item> <item>@string/quality_original</item>
<item>1080p - 8Mbps</item> <item>@string/quality_1080p</item>
<item>720p - 3Mbps</item> <item>@string/quality_720p</item>
<item>480p - 1.5Mbps</item> <item>@string/quality_480p</item>
<item>360p - 800Kbps</item> <item>@string/quality_360p</item>
</string-array> </string-array>
<string-array name="download_quality_values"> <string-array name="download_quality_values">
<item>Original</item> <item>Original</item>

9
core/src/main/res/values/strings.xml
View file

@ -192,4 +192,13 @@
<string name="unmark_as_played">Unmark as played</string> <string name="unmark_as_played">Unmark as played</string>
<string name="add_to_favorites">Add to favorites</string> <string name="add_to_favorites">Add to favorites</string>
<string name="remove_from_favorites">Remove from favorites</string> <string name="remove_from_favorites">Remove from favorites</string>
<string name="quality_default">Default to selected download quality</string>
<string name="download_quality">Download Quality</string>
<string name="select_quality">Select Video Quality</string>
<string name="quality_auto">Auto</string>
<string name="quality_original">Original</string>
<string name="quality_1080p">1080p - 8Mbps</string>
<string name="quality_720p">720p - 3Mbps</string>
<string name="quality_480p">480p - 1.5Mbps</string>
<string name="quality_360p">360p - 0.8Mbps</string>
</resources> </resources>

6
core/src/main/res/xml/fragment_settings_downloads.xml
View file

@ -12,13 +12,13 @@
<!-- TODO: Strings --> <!-- TODO: Strings -->
<ListPreference <ListPreference
android:key="pref_downloads_quality" android:key="pref_downloads_quality"
android:title="Download Quality" android:title="@string/download_quality"
android:defaultValue="Original" android:defaultValue="@string/quality_original"
android:entries="@array/download_quality_entries" android:entries="@array/download_quality_entries"
android:entryValues="@array/download_quality_values" android:entryValues="@array/download_quality_values"
android:summary="%s" /> android:summary="%s" />
<SwitchPreferenceCompat <SwitchPreferenceCompat
android:defaultValue="false" android:defaultValue="false"
app:key="pref_downloads_quality_default" app:key="pref_downloads_quality_default"
app:summary="Default to picked Download Quality" /> app:summary="@string/quality_default" />
</PreferenceScreen> </PreferenceScreen>