Skip to content
Snippets Groups Projects
Commit 59fc5f74 authored by Nicolas Pomepuy's avatar Nicolas Pomepuy Committed by Geoffrey Métais
Browse files

Replace android strings by the ones in the app (ok/cancel/yes)

(cherry picked from commit 0bdff9c5)
parent 280eaac6
No related branches found
No related tags found
No related merge requests found
......@@ -121,7 +121,7 @@
android:id="@+id/server_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@android:string/cancel"
android:text="@string/cancel"
android:layout_below="@id/server_name"
android:layout_toStartOf="@+id/server_save"
style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"/>
......@@ -132,7 +132,7 @@
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_marginStart="8dp"
android:text="@android:string/ok"
android:text="@string/ok"
android:layout_below="@id/server_name"
style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"/>
</RelativeLayout>
......
......@@ -72,29 +72,29 @@
android:text="@string/encryption_warning"
android:visibility="@{dialog.asksStore() &amp;&amp; !AndroidUtil.isMarshMallowOrLater ? View.VISIBLE : View.GONE}" />
<Button
android:id="@+id/cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/warning"
android:layout_toStartOf="@+id/action"
android:focusable="true"
android:text="@android:string/cancel"
android:textSize="14sp"
android:onClick="@{handler::onCancel}"
style="@style/Widget.MaterialComponents.Button.TextButton.Dialog" />
android:id="@+id/cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/warning"
android:layout_toStartOf="@+id/action"
android:focusable="true"
android:text="@string/cancel"
android:textSize="14sp"
android:onClick="@{handler::onCancel}"
style="@style/Widget.MaterialComponents.Button.TextButton.Dialog" />
<Button
android:id="@+id/action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_marginStart="@dimen/default_margin"
android:layout_marginEnd="8dp"
android:focusable="true"
android:layout_below="@+id/warning"
android:text="@android:string/ok"
android:textSize="14sp"
android:onClick="@{handler::onLogin}"
style="@style/Widget.MaterialComponents.Button.TextButton.Dialog" />
android:id="@+id/action"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_marginStart="@dimen/default_margin"
android:layout_marginEnd="8dp"
android:focusable="true"
android:layout_below="@+id/warning"
android:text="@string/ok"
android:textSize="14sp"
android:onClick="@{handler::onLogin}"
style="@style/Widget.MaterialComponents.Button.TextButton.Dialog" />
</RelativeLayout>
</ScrollView>
</layout>
......@@ -30,17 +30,17 @@
android:max="100"
android:indeterminate="@{dialog.isIndeterminate()}"/>
<Button
android:id="@+id/cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/progress"
android:text="@android:string/cancel"
android:textSize="14sp"
android:layout_alignParentEnd="true"
android:layout_marginEnd="8dp"
android:onClick="@{handler::onCancel}"
style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
android:visibility="@{TextUtils.isEmpty(dialog.cancelText) ? View.GONE : View.VISIBLE}"/>
android:id="@+id/cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/progress"
android:text="@string/cancel"
android:textSize="14sp"
android:layout_alignParentEnd="true"
android:layout_marginEnd="8dp"
android:onClick="@{handler::onCancel}"
style="@style/Widget.MaterialComponents.Button.TextButton.Dialog"
android:visibility="@{TextUtils.isEmpty(dialog.cancelText) ? View.GONE : View.VISIBLE}"/>
tools:visibility="visible"/>
</RelativeLayout>
</ScrollView>
......
......@@ -22,16 +22,16 @@
android:text="@{dialog.text}"
android:layout_margin="8dp" />
<Button
android:id="@+id/cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/text"
android:text="@{TextUtils.isEmpty(dialog.cancelText) ? @android:string/cancel : dialog.cancelText}"
android:textSize="14sp"
android:layout_toStartOf="@+id/action2"
android:layout_marginStart="@dimen/default_margin"
android:onClick="@{handler::onCancel}"
style="@style/Widget.MaterialComponents.Button.TextButton.Dialog" />
android:id="@+id/cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/text"
android:text="@{TextUtils.isEmpty(dialog.cancelText) ? @string/cancel : dialog.cancelText}"
android:textSize="14sp"
android:layout_toStartOf="@+id/action2"
android:layout_marginStart="@dimen/default_margin"
android:onClick="@{handler::onCancel}"
style="@style/Widget.MaterialComponents.Button.TextButton.Dialog" />
<Button
android:id="@+id/action2"
android:layout_width="wrap_content"
......
......@@ -185,7 +185,7 @@ object UiTools {
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
fun snackerConfirm(view: View, message: String, action: Runnable) {
val snack = Snackbar.make(view, message, Snackbar.LENGTH_LONG)
.setAction(android.R.string.ok) { action.run() }
.setAction(R.string.ok) { action.run() }
if (AndroidUtil.isLolliPopOrLater)
snack.view.elevation = view.resources.getDimensionPixelSize(R.dimen.audio_player_elevation).toFloat()
snack.show()
......@@ -193,7 +193,7 @@ object UiTools {
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
fun CoroutineScope.snackerConfirm(view: View, message: String, action: suspend() -> Unit) {
val snack = Snackbar.make(view, message, Snackbar.LENGTH_LONG)
.setAction(android.R.string.ok) { launch { action.invoke() } }
.setAction(R.string.ok) { launch { action.invoke() } }
if (AndroidUtil.isLolliPopOrLater)
snack.view.elevation = view.resources.getDimensionPixelSize(R.dimen.audio_player_elevation).toFloat()
snack.show()
......@@ -206,7 +206,7 @@ object UiTools {
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
fun snackerWithCancel(view: View, message: String, action: Runnable?, cancelAction: Runnable?) {
@SuppressLint("WrongConstant") val snack = Snackbar.make(view, message, DELETE_DURATION)
.setAction(android.R.string.cancel) {
.setAction(R.string.cancel) {
if (action != null)
sHandler.removeCallbacks(action)
cancelAction?.run()
......
......@@ -193,10 +193,10 @@ class MRLPanelFragment : Fragment(), View.OnKeyListener, TextView.OnEditorAction
AlertDialog.Builder(requireContext())
.setTitle(getString(R.string.rename_media, media.title))
.setView(edit)
.setPositiveButton(android.R.string.ok) { _, _ ->
.setPositiveButton(R.string.ok) { _, _ ->
viewModel.rename(position, edit.text.toString())
}
.setNegativeButton(android.R.string.cancel) { dialog, _ -> dialog.dismiss() }
.setNegativeButton(R.string.cancel) { dialog, _ -> dialog.dismiss() }
.show()
}
......
......@@ -84,9 +84,9 @@ class PreferencesAdvanced : BasePreferenceFragment(), SharedPreferences.OnShared
.setTitle(R.string.clear_playback_history)
.setMessage(R.string.validation)
.setIcon(android.R.drawable.ic_dialog_alert)
.setPositiveButton(android.R.string.yes) { dialog, _ -> AbstractMedialibrary.getInstance().clearHistory() }
.setPositiveButton(R.string.yes) { dialog, _ -> AbstractMedialibrary.getInstance().clearHistory() }
.setNegativeButton(android.R.string.cancel, null).show()
.setNegativeButton(R.string.cancel, null).show()
return true
}
"clear_media_db" -> {
......
......@@ -84,8 +84,8 @@ class PreferencesAdvanced : BasePreferenceFragment(), SharedPreferences.OnShared
.setTitle(R.string.clear_playback_history)
.setMessage(R.string.validation)
.setIcon(android.R.drawable.ic_dialog_alert)
.setPositiveButton(android.R.string.yes) { _, _ -> AbstractMedialibrary.getInstance().clearHistory() }
.setNegativeButton(android.R.string.cancel, null).show()
.setPositiveButton(R.string.yes) { _, _ -> AbstractMedialibrary.getInstance().clearHistory() }
.setNegativeButton(R.string.cancel, null).show()
return true
}
"clear_media_db" -> {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment