Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Suyu
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
many-archive
Suyu
Commits
86fc1e5b
There was an error fetching the commit references. Please try again later.
Commit
86fc1e5b
authored
1 year ago
by
t895
Browse files
Options
Downloads
Patches
Plain Diff
android: Swap ok and close default strings for MessageDialogFragment
parent
95d96cfe
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt
+3
-3
3 additions, 3 deletions
...java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt
with
3 additions
and
3 deletions
src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/MessageDialogFragment.kt
+
3
−
3
View file @
86fc1e5b
...
@@ -42,9 +42,9 @@ class MessageDialogFragment : DialogFragment() {
...
@@ -42,9 +42,9 @@ class MessageDialogFragment : DialogFragment() {
}
else
if
(
positiveButtonString
.
isNotEmpty
())
{
}
else
if
(
positiveButtonString
.
isNotEmpty
())
{
positiveButtonString
positiveButtonString
}
else
if
(
messageDialogViewModel
.
positiveAction
!=
null
)
{
}
else
if
(
messageDialogViewModel
.
positiveAction
!=
null
)
{
getString
(
R
.
string
.
close
)
}
else
{
getString
(
android
.
R
.
string
.
ok
)
getString
(
android
.
R
.
string
.
ok
)
}
else
{
getString
(
R
.
string
.
close
)
}
}
val
negativeButtonId
=
requireArguments
().
getInt
(
NEGATIVE_BUTTON_TITLE_ID
)
val
negativeButtonId
=
requireArguments
().
getInt
(
NEGATIVE_BUTTON_TITLE_ID
)
...
@@ -131,7 +131,7 @@ class MessageDialogFragment : DialogFragment() {
...
@@ -131,7 +131,7 @@ class MessageDialogFragment : DialogFragment() {
* @param positiveButtonTitleId String resource ID that will be used for the positive button.
* @param positiveButtonTitleId String resource ID that will be used for the positive button.
* [positiveButtonTitleString] used if 0.
* [positiveButtonTitleString] used if 0.
* @param positiveButtonTitleString String that will be used for the positive button.
* @param positiveButtonTitleString String that will be used for the positive button.
* android.R.string.
ok
used if empty. android.R.string.
close
will be used if [positiveAction]
* android.R.string.
close
used if empty. android.R.string.
ok
will be used if [positiveAction]
* is not null.
* is not null.
* @param positiveAction Lambda to run when the positive button is clicked.
* @param positiveAction Lambda to run when the positive button is clicked.
* @param showNegativeButton Normally the negative button isn't shown if there is no
* @param showNegativeButton Normally the negative button isn't shown if there is no
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment