diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerFragment.kt index 996824bc..7591efe5 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerFragment.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/player/PlayerFragment.kt @@ -1166,12 +1166,12 @@ class PlayerFragment : Fragment() { override fun onAnimationEnd(animation: Animation?) { exo_rew_text.post { - exo_rew_text.text = getString(R.string.rew_text_format).format(fastForwardTime) + exo_rew_text.text = getString(R.string.rew_text_regular_format).format(fastForwardTime) } } }) exo_rew_text.startAnimation(goLeft) - exo_rew_text.text = getString(R.string.rew_text_regular_format).format(fastForwardTime) + exo_rew_text.text = getString(R.string.rew_text_format).format(fastForwardTime) seekTime(fastForwardTime * -1000L) } @@ -1191,12 +1191,12 @@ class PlayerFragment : Fragment() { override fun onAnimationEnd(animation: Animation?) { exo_ffwd_text.post { - exo_ffwd_text.text = getString(R.string.ffw_text_format).format(fastForwardTime) + exo_ffwd_text.text = getString(R.string.ffw_text_regular_format).format(fastForwardTime) } } }) exo_ffwd_text.startAnimation(goRight) - exo_ffwd_text.text = getString(R.string.ffw_text_regular_format).format(fastForwardTime) + exo_ffwd_text.text = getString(R.string.ffw_text_format).format(fastForwardTime) seekTime(fastForwardTime * 1000L) } diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt index 479443f4..adf34a72 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/InAppUpdater.kt @@ -154,7 +154,7 @@ class InAppUpdater { val request = DownloadManager.Request(Uri.parse(url)) .setMimeType("application/vnd.android.package-archive") - .setTitle("CloudStream update") + .setTitle("CloudStream " + getString(R.string.update)) .setDestinationInExternalPublicDir( Environment.DIRECTORY_DOWNLOADS, "CloudStream.apk" @@ -234,13 +234,13 @@ class InAppUpdater { } val builder: AlertDialog.Builder = AlertDialog.Builder(this) - builder.setTitle("New update found!\n${currentVersion?.versionName} -> ${update.updateVersion}") + builder.setTitle(getString(R.string.new_update_format).format(currentVersion?.versionName,update.updateVersion)) builder.setMessage("${update.changelog}") val context = this builder.apply { - setPositiveButton("Update") { _, _ -> - showToast(context, "Download started", Toast.LENGTH_LONG) + setPositiveButton(R.string.update) { _, _ -> + showToast(context, R.string.download_started, Toast.LENGTH_LONG) thread { val downloadStatus = normalSafeApiCall { context.downloadUpdate(update.updateURL) } ?: false @@ -248,7 +248,7 @@ class InAppUpdater { runOnUiThread { showToast( context, - "Download Failed", + R.string.download_failed, Toast.LENGTH_LONG ) } @@ -256,10 +256,10 @@ class InAppUpdater { } } - setNegativeButton("Cancel") { _, _ -> } + setNegativeButton(R.string.cancel) { _, _ -> } if (checkAutoUpdate) { - setNeutralButton("Don't show again") { _, _ -> + setNeutralButton(R.string.dont_show_again) { _, _ -> settingsManager.edit().putBoolean("auto_update", false).apply() } } diff --git a/app/src/main/res/layout/player_custom_layout.xml b/app/src/main/res/layout/player_custom_layout.xml index a6ba2c2d..69330851 100644 --- a/app/src/main/res/layout/player_custom_layout.xml +++ b/app/src/main/res/layout/player_custom_layout.xml @@ -465,7 +465,7 @@ Betygsatt: %.1f + Hastighet (%.2fx) CloudStream Hem @@ -182,4 +183,14 @@ Ingen uppdatering hittad Sök efter uppdatering + + Skärmlås + Bildförhållande + Källa + Hoppa över OP + + Visa inte igen + Nerladdning startad + Nerladdning Misslyckades + Uppdatering diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c7d541e0..971a7587 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -20,8 +20,9 @@ -%d %d %d - Speed (%fx) + Speed (%.2fx) Rated: %.1f + New update found!\n%s -> %s CloudStream Home @@ -211,4 +212,14 @@ No Update Found Check for Update + + Lock + Resize + Source + Skip OP + + Don\'t show again + Download started + Download Failed + Update