piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11317 from t895/dialog-adjustment

Browse Source 
Android: Use progress indicator in short loading scenarios
This commit is contained in:
Mai 2022-12-04 09:15:39 +00:00 committed by GitHub
commit 51dfab6823
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/cheats/ui/CheatsActivity.java
View File

@ -208,7 +208,8 @@ public class CheatsActivity extends AppCompatActivity
public void downloadGeckoCodes()
{
AlertDialog progressDialog = new MaterialAlertDialogBuilder(this)
.setMessage(R.string.cheats_downloading)
.setTitle(R.string.cheats_downloading)
.setView(R.layout.dialog_indeterminate_progress)
.setCancelable(false)
.show();

3
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java
View File

@ -240,8 +240,7 @@ public final class SettingsActivity extends AppCompatActivity implements Setting
{
dialog = new MaterialAlertDialogBuilder(this)
.setTitle(getString(R.string.load_settings))
.setView(getLayoutInflater().inflate(R.layout.dialog_indeterminate_progress, null,
false))
.setView(R.layout.dialog_indeterminate_progress)
.create();
}
dialog.show();

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ThreadUtil.java
View File

@ -31,6 +31,7 @@ public class ThreadUtil
Resources resources = activity.getResources();
AlertDialog progressDialog = new MaterialAlertDialogBuilder(activity)
.setTitle(progressTitle)
.setView(R.layout.dialog_indeterminate_progress)
.setCancelable(false)
.create();

6
Source/Android/app/src/main/res/layout/dialog_indeterminate_progress.xml
View File

@ -4,11 +4,11 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.google.android.material.progressindicator.CircularProgressIndicator
android:layout_width="wrap_content"
<com.google.android.material.progressindicator.LinearProgressIndicator
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_margin="16dp"
android:layout_margin="24dp"
android:indeterminate="true"
app:trackCornerRadius="2dp" />