ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9064 from JosJuice/android-filepicker-normal 

Android: Make FilePicker act like a normal setting
This commit is contained in:
LC 2020-09-07 22:33:10 -04:00 committed by GitHub
parent 48cfc32bf3 00a8f4faaa
commit 95376208a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/FilePicker.java
View File

@ -20,6 +20,11 @@ public final class FilePicker extends SettingsItem
return settings.getSection(getFile(), getSection()).getString(getKey(), mDefaultValue); return settings.getSection(getFile(), getSection()).getString(getKey(), mDefaultValue);
} }
public void setSelectedValue(Settings settings, String selection)
{
settings.getSection(getFile(), getSection()).setString(getKey(), selection);
}
public int getRequestType() public int getRequestType()
{ {
return mRequestType; return mRequestType;

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

@ -171,28 +171,14 @@ public final class SettingsActivity extends AppCompatActivity implements Setting
{ {
super.onActivityResult(requestCode, resultCode, result); super.onActivityResult(requestCode, resultCode, result);
// Save modified non-FilePicker settings beforehand since finish() won't save them.
// onStop() must come before handling the resultCode to properly save FilePicker selection.
mPresenter.onStop(true);
// If the user picked a file, as opposed to just backing out. // If the user picked a file, as opposed to just backing out.
if (resultCode == MainActivity.RESULT_OK) if (resultCode == MainActivity.RESULT_OK)
{ {
String path = FileBrowserHelper.getSelectedPath(result); String path = FileBrowserHelper.getSelectedPath(result);
getFragment().getAdapter().onFilePickerConfirmation(path); getFragment().getAdapter().onFilePickerConfirmation(path);
// Prevent duplicate Toasts.
if (!mPresenter.shouldSave())
{
Toast.makeText(this, "Saved settings to INI files", Toast.LENGTH_SHORT).show();
} }
} }
// TODO: After result of FilePicker, duplicate SettingsActivity appears.
// Finish to avoid this. Is there a better method?
finish();
}
@Override @Override
public void showLoading() public void showLoading()
{ {

8
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java
View File

@ -310,12 +310,10 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
{ {
FilePicker filePicker = (FilePicker) mClickedItem; FilePicker filePicker = (FilePicker) mClickedItem;
File file = SettingsFile.getSettingsFile(filePicker.getFile()); if (!filePicker.getSelectedValue(mView.getSettings()).equals(selectedFile))
IniFile ini = new IniFile(file); mView.onSettingChanged(filePicker.getKey());
ini.setString(filePicker.getSection(), filePicker.getKey(), selectedFile);
ini.save(file);
NativeLibrary.ReloadConfig(); filePicker.setSelectedValue(mView.getSettings(), selectedFile);
mClickedItem = null; mClickedItem = null;
} }

7
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/FilePickerViewHolder.java
View File

@ -7,9 +7,7 @@ import org.dolphinemu.dolphinemu.R;
import org.dolphinemu.dolphinemu.features.settings.model.view.FilePicker; import org.dolphinemu.dolphinemu.features.settings.model.view.FilePicker;
import org.dolphinemu.dolphinemu.features.settings.model.view.SettingsItem; import org.dolphinemu.dolphinemu.features.settings.model.view.SettingsItem;
import org.dolphinemu.dolphinemu.features.settings.ui.SettingsAdapter; import org.dolphinemu.dolphinemu.features.settings.ui.SettingsAdapter;
import org.dolphinemu.dolphinemu.features.settings.utils.SettingsFile;
import org.dolphinemu.dolphinemu.ui.main.MainPresenter; import org.dolphinemu.dolphinemu.ui.main.MainPresenter;
import org.dolphinemu.dolphinemu.utils.IniFile;
public final class FilePickerViewHolder extends SettingViewHolder public final class FilePickerViewHolder extends SettingViewHolder
{ {
@ -45,10 +43,7 @@ public final class FilePickerViewHolder extends SettingViewHolder
} }
else else
{ {
// TODO: Reopening INI files all the time is slow mTextSettingDescription.setText(mFilePicker.getSelectedValue(getAdapter().getSettings()));
IniFile ini = new IniFile(SettingsFile.getSettingsFile(mFilePicker.getFile()));
mTextSettingDescription.setText(ini.getString(item.getSection(), item.getKey(),
mFilePicker.getSelectedValue(getAdapter().getSettings())));
} }
} }