Citra-emu/citra-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move "select game folder" string to resource

Browse Source
This commit is contained in:
Weiyi Wang 2019-07-28 19:13:30 -04:00 committed by bunnei
parent 57b332151f
commit 1122821d9c
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/android/app/src/main/java/org/citra/citra_android/activities/CustomFilePickerActivity.java
View File

@ -26,7 +26,7 @@ public class CustomFilePickerActivity extends FilePickerActivity {
mode, allowMultiple, allowCreateDir, allowExistingFile, singleClick); mode, allowMultiple, allowCreateDir, allowExistingFile, singleClick);
Intent intent = getIntent(); Intent intent = getIntent();
String title = intent == null ? null : intent.getStringExtra(EXTRA_TITLE); int title = intent == null ? 0 : intent.getIntExtra(EXTRA_TITLE, 0);
fragment.setTitle(title); fragment.setTitle(title);
return fragment; return fragment;
} }

6
src/android/app/src/main/java/org/citra/citra_android/fragments/CustomFilePickerFragment.java
View File

@ -16,7 +16,7 @@ import org.citra.citra_android.R;
import java.io.File; import java.io.File;
public class CustomFilePickerFragment extends FilePickerFragment { public class CustomFilePickerFragment extends FilePickerFragment {
private String mTitle; private int mTitle;
@NonNull @NonNull
@Override @Override
@ -30,7 +30,7 @@ public class CustomFilePickerFragment extends FilePickerFragment {
@Override @Override
protected View inflateRootView(LayoutInflater inflater, ViewGroup container) { protected View inflateRootView(LayoutInflater inflater, ViewGroup container) {
View view = super.inflateRootView(inflater, container); View view = super.inflateRootView(inflater, container);
if (mTitle != null) { if (mTitle != 0) {
Toolbar toolbar = view.findViewById(com.nononsenseapps.filepicker.R.id.nnf_picker_toolbar); Toolbar toolbar = view.findViewById(com.nononsenseapps.filepicker.R.id.nnf_picker_toolbar);
ViewGroup parent = (ViewGroup) toolbar.getParent(); ViewGroup parent = (ViewGroup) toolbar.getParent();
int index = parent.indexOfChild(toolbar); int index = parent.indexOfChild(toolbar);
@ -43,7 +43,7 @@ public class CustomFilePickerFragment extends FilePickerFragment {
return view; return view;
} }
public void setTitle(String title) { public void setTitle(int title) {
mTitle = title; mTitle = title;
} }
} }

2
src/android/app/src/main/java/org/citra/citra_android/ui/main/MainActivity.java
View File

@ -115,7 +115,7 @@ public final class MainActivity extends AppCompatActivity implements MainView {
@Override @Override
public void launchFileListActivity() { public void launchFileListActivity() {
FileBrowserHelper.openDirectoryPicker(this, MainPresenter.REQUEST_ADD_DIRECTORY, FileBrowserHelper.openDirectoryPicker(this, MainPresenter.REQUEST_ADD_DIRECTORY,
"Select game folder"); R.string.select_game_folder);
} }
@Override @Override

2
src/android/app/src/main/java/org/citra/citra_android/ui/main/TvMainActivity.java
View File

@ -119,7 +119,7 @@ public final class TvMainActivity extends FragmentActivity implements MainView {
@Override @Override
public void launchFileListActivity() { public void launchFileListActivity() {
FileBrowserHelper.openDirectoryPicker(this, MainPresenter.REQUEST_ADD_DIRECTORY, FileBrowserHelper.openDirectoryPicker(this, MainPresenter.REQUEST_ADD_DIRECTORY,
"Select game folder"); R.string.select_game_folder);
} }
@Override @Override

4
src/android/app/src/main/java/org/citra/citra_android/utils/FileBrowserHelper.java
View File

@ -15,7 +15,7 @@ import java.io.File;
import java.util.List; import java.util.List;
public final class FileBrowserHelper { public final class FileBrowserHelper {
public static void openDirectoryPicker(FragmentActivity activity, int requestCode, String title) { public static void openDirectoryPicker(FragmentActivity activity, int requestCode, int title) {
Intent i = new Intent(activity, CustomFilePickerActivity.class); Intent i = new Intent(activity, CustomFilePickerActivity.class);
i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false); i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false);
@ -28,7 +28,7 @@ public final class FileBrowserHelper {
activity.startActivityForResult(i, requestCode); activity.startActivityForResult(i, requestCode);
} }
public static void openFilePicker(FragmentActivity activity, int requestCode, String title) { public static void openFilePicker(FragmentActivity activity, int requestCode, int title) {
Intent i = new Intent(activity, CustomFilePickerActivity.class); Intent i = new Intent(activity, CustomFilePickerActivity.class);
i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false); i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false);

1
src/android/app/src/main/res/values/strings.xml
View File

@ -98,6 +98,7 @@
<string name="grid_menu_refresh">Refresh Library</string> <string name="grid_menu_refresh">Refresh Library</string>
<!-- Add Directory Screen--> <!-- Add Directory Screen-->
<string name="select_game_folder">Select Game Folder</string>
<string name="add_directory_title">Add Folder to Library</string> <string name="add_directory_title">Add Folder to Library</string>
<string name="add_directory_up_one_level">Up one level</string> <string name="add_directory_up_one_level">Up one level</string>
<string name="add_directory_empty_folder">That folder is empty.</string> <string name="add_directory_empty_folder">That folder is empty.</string>