|
@@ -125,7 +125,7 @@ class MovieEditActivity : AppCompatActivity(),
|
|
setContentView(R.layout.activity_movie_edit)
|
|
setContentView(R.layout.activity_movie_edit)
|
|
|
|
|
|
progressDialog = ProgressDialog(this).apply {
|
|
progressDialog = ProgressDialog(this).apply {
|
|
- setMessage("progressing")
|
|
|
|
|
|
+ setMessage(getString(R.string.progressing))
|
|
setCancelable(false)
|
|
setCancelable(false)
|
|
}
|
|
}
|
|
|
|
|
|
@@ -546,7 +546,7 @@ class MovieEditActivity : AppCompatActivity(),
|
|
val pd = ProgressDialog(this).apply {
|
|
val pd = ProgressDialog(this).apply {
|
|
val t = viewModel.storyPeriodLiveData.value ?: 0
|
|
val t = viewModel.storyPeriodLiveData.value ?: 0
|
|
max = (t / 33).toInt()
|
|
max = (t / 33).toInt()
|
|
- setMessage("progressing")
|
|
|
|
|
|
+ setMessage(getString(R.string.progressing))
|
|
setOnCancelListener {
|
|
setOnCancelListener {
|
|
disposable?.dispose()
|
|
disposable?.dispose()
|
|
onMovieSavedListener.onSaved(outputFile)
|
|
onMovieSavedListener.onSaved(outputFile)
|
|
@@ -600,7 +600,7 @@ class MovieEditActivity : AppCompatActivity(),
|
|
.subscribe({
|
|
.subscribe({
|
|
val progress = (it * 100).toInt()
|
|
val progress = (it * 100).toInt()
|
|
val msg = if (progress >= 100) {
|
|
val msg = if (progress >= 100) {
|
|
- "processing ..."
|
|
|
|
|
|
+ getString(R.string.progressing)
|
|
} else {
|
|
} else {
|
|
"$progress%"
|
|
"$progress%"
|
|
}
|
|
}
|