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 #9042 from Ebola16/FP 

Android: Minor cleanup
This commit is contained in:
LC 2020-09-01 07:27:07 -04:00 committed by GitHub
parent d17c407f09 85ddb8fc86
commit fb32f1ab88
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
43 changed files with 233 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/AppLinkActivity.java
View File

@ -30,7 +30,6 @@ public class AppLinkActivity extends FragmentActivity
private AppLinkHelper.PlayAction playAction;
private DirectoryStateReceiver directoryStateReceiver;
private BroadcastReceiver gameFileCacheReceiver;
@Override
protected void onCreate(Bundle savedInstanceState)
@ -96,18 +95,17 @@ public class AppLinkActivity extends FragmentActivity
}
});
gameFileCacheReceiver =
new BroadcastReceiver()
{
@Override
public void onReceive(Context context, Intent intent)
{
if (DirectoryInitialization.areDolphinDirectoriesReady())
{
tryPlay(playAction);
}
}
};
BroadcastReceiver gameFileCacheReceiver = new BroadcastReceiver()
{
@Override
public void onReceive(Context context, Intent intent)
{
if (DirectoryInitialization.areDolphinDirectoriesReady())
{
tryPlay(playAction);
}
}
};
LocalBroadcastManager broadcastManager = LocalBroadcastManager.getInstance(this);
broadcastManager.registerReceiver(directoryStateReceiver, directoryStateIntentFilter);

46
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
View File

@ -67,7 +67,6 @@ public final class EmulationActivity extends AppCompatActivity
private SharedPreferences mPreferences;
private MotionListener mMotionListener;
private ControllerMappingHelper mControllerMappingHelper;
private Settings mSettings;
@ -317,7 +316,6 @@ public final class EmulationActivity extends AppCompatActivity
sIsGameCubeGame = Platform.fromNativeInt(mPlatform) == Platform.GAMECUBE;
mDeviceHasTouchScreen = getPackageManager().hasSystemFeature("android.hardware.touchscreen");
mMotionListener = new MotionListener(this);
mControllerMappingHelper = new ControllerMappingHelper();
int themeId;
if (mDeviceHasTouchScreen)
@ -445,19 +443,17 @@ public final class EmulationActivity extends AppCompatActivity
protected void onActivityResult(int requestCode, int resultCode, Intent result)
{
super.onActivityResult(requestCode, resultCode, result);
switch (requestCode)
if (requestCode == REQUEST_CHANGE_DISC)
{
case REQUEST_CHANGE_DISC:
// If the user picked a file, as opposed to just backing out.
if (resultCode == MainActivity.RESULT_OK)
// If the user picked a file, as opposed to just backing out.
if (resultCode == MainActivity.RESULT_OK)
{
String newDiscPath = FileBrowserHelper.getSelectedPath(result);
if (!TextUtils.isEmpty(newDiscPath))
{
String newDiscPath = FileBrowserHelper.getSelectedPath(result);
if (!TextUtils.isEmpty(newDiscPath))
{
NativeLibrary.ChangeDisc(newDiscPath);
}
NativeLibrary.ChangeDisc(newDiscPath);
}
break;
}
}
}
@ -1041,14 +1037,14 @@ public final class EmulationActivity extends AppCompatActivity
private void setIRSensitivity()
{
int ir_pitch = Integer.valueOf(
int ir_pitch = Integer.parseInt(
mPreferences.getString(SettingsFile.KEY_WIIBIND_IR_PITCH + mSelectedGameId, "15"));
LayoutInflater inflater = LayoutInflater.from(this);
View view = inflater.inflate(R.layout.dialog_ir_sensitivity, null);
TextView text_slider_value_pitch = (TextView) view.findViewById(R.id.text_ir_pitch);
TextView units = (TextView) view.findViewById(R.id.text_ir_pitch_units);
TextView text_slider_value_pitch = view.findViewById(R.id.text_ir_pitch);
TextView units = view.findViewById(R.id.text_ir_pitch_units);
SeekBar seekbar_pitch = view.findViewById(R.id.seekbar_pitch);
text_slider_value_pitch.setText(String.valueOf(ir_pitch));
@ -1074,11 +1070,11 @@ public final class EmulationActivity extends AppCompatActivity
}
});
int ir_yaw = Integer.valueOf(
int ir_yaw = Integer.parseInt(
mPreferences.getString(SettingsFile.KEY_WIIBIND_IR_YAW + mSelectedGameId, "15"));
TextView text_slider_value_yaw = (TextView) view.findViewById(R.id.text_ir_yaw);
TextView units_yaw = (TextView) view.findViewById(R.id.text_ir_yaw_units);
TextView text_slider_value_yaw = view.findViewById(R.id.text_ir_yaw);
TextView units_yaw = view.findViewById(R.id.text_ir_yaw_units);
SeekBar seekbar_yaw = view.findViewById(R.id.seekbar_width);
text_slider_value_yaw.setText(String.valueOf(ir_yaw));
@ -1105,14 +1101,12 @@ public final class EmulationActivity extends AppCompatActivity
});
int ir_vertical_offset = Integer.valueOf(
int ir_vertical_offset = Integer.parseInt(
mPreferences.getString(SettingsFile.KEY_WIIBIND_IR_VERTICAL_OFFSET + mSelectedGameId,
"10"));
TextView text_slider_value_vertical_offset =
(TextView) view.findViewById(R.id.text_ir_vertical_offset);
TextView units_vertical_offset =
(TextView) view.findViewById(R.id.text_ir_vertical_offset_units);
TextView text_slider_value_vertical_offset = view.findViewById(R.id.text_ir_vertical_offset);
TextView units_vertical_offset = view.findViewById(R.id.text_ir_vertical_offset_units);
SeekBar seekbar_vertical_offset = view.findViewById(R.id.seekbar_vertical_offset);
text_slider_value_vertical_offset.setText(String.valueOf(ir_vertical_offset));
@ -1176,9 +1170,7 @@ public final class EmulationActivity extends AppCompatActivity
new AlertDialog.Builder(this, R.style.DolphinDialogBase)
.setTitle(getString(R.string.emulation_touch_overlay_reset))
.setPositiveButton(R.string.yes, (dialogInterface, i) ->
{
mEmulationFragment.resetInputOverlay();
})
mEmulationFragment.resetInputOverlay())
.setNegativeButton(R.string.cancel, (dialogInterface, i) ->
{
})
@ -1210,7 +1202,7 @@ public final class EmulationActivity extends AppCompatActivity
{
int axis = range.getAxis();
float origValue = event.getAxisValue(axis);
float value = mControllerMappingHelper.scaleAxis(input, axis, origValue);
float value = ControllerMappingHelper.scaleAxis(input, axis, origValue);
// If the input is still in the "flat" area, that means it's really zero.
// This is used to compensate for imprecision in joysticks.
if (Math.abs(value) > range.getFlat())

4
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/PlatformPagerAdapter.java
View File

@ -3,6 +3,7 @@ package org.dolphinemu.dolphinemu.adapters;
import android.content.Context;
import android.graphics.drawable.Drawable;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;
@ -28,10 +29,11 @@ public class PlatformPagerAdapter extends FragmentPagerAdapter
public PlatformPagerAdapter(FragmentManager fm, Context context)
{
super(fm);
super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
mContext = context;
}
@NonNull
@Override
public Fragment getItem(int position)
{

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameDetailsDialog.java
View File

@ -73,7 +73,7 @@ public final class GameDetailsDialog extends DialogFragment
textCountry.setText(country);
textCompany.setText(gameFile.getCompany());
textGameId.setText(gameFile.getGameId());
textRevision.setText(Integer.toString(gameFile.getRevision()));
textRevision.setText(String.valueOf(gameFile.getRevision()));
if (!gameFile.shouldShowFileFormatDetails())
{

21
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java
View File

@ -44,20 +44,17 @@ public final class MotionAlertDialog extends AlertDialog
public boolean onKeyEvent(int keyCode, KeyEvent event)
{
Log.debug("[MotionAlertDialog] Received key event: " + event.getAction());
switch (event.getAction())
if (event.getAction() == KeyEvent.ACTION_UP)
{
case KeyEvent.ACTION_UP:
if (!ControllerMappingHelper.shouldKeyBeIgnored(event.getDevice(), keyCode))
{
setting.onKeyInput(event);
dismiss();
}
// Even if we ignore the key, we still consume it. Thus return true regardless.
return true;
default:
return false;
if (!ControllerMappingHelper.shouldKeyBeIgnored(event.getDevice(), keyCode))
{
setting.onKeyInput(event);
dismiss();
}
// Even if we ignore the key, we still consume it. Thus return true regardless.
return true;
}
return false;
}
@Override

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

@ -1,5 +1,7 @@
package org.dolphinemu.dolphinemu.features.settings.ui;
import androidx.annotation.NonNull;
public enum MenuTag
{
CONFIG("config"),
@ -46,6 +48,7 @@ public enum MenuTag
this.subType = subtype;
}
@NonNull
@Override
public String toString()
{

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

@ -143,11 +143,10 @@ public final class SettingsActivityPresenter
public boolean handleOptionsItem(int itemId)
{
switch (itemId)
if (itemId == R.id.menu_save_exit)
{
case R.id.menu_save_exit:
mView.finish();
return true;
mView.finish();
return true;
}
return false;

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

@ -2,8 +2,6 @@ package org.dolphinemu.dolphinemu.features.settings.ui;
import android.content.Context;
import android.content.DialogInterface;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
import androidx.appcompat.app.AlertDialog;
import androidx.recyclerview.widget.RecyclerView;
@ -45,7 +43,6 @@ import org.dolphinemu.dolphinemu.features.settings.ui.viewholder.SubmenuViewHold
import org.dolphinemu.dolphinemu.features.settings.utils.SettingsFile;
import org.dolphinemu.dolphinemu.ui.main.MainPresenter;
import org.dolphinemu.dolphinemu.utils.FileBrowserHelper;
import org.dolphinemu.dolphinemu.utils.Log;
import java.security.InvalidParameterException;
import java.util.ArrayList;
@ -97,7 +94,7 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
case SettingsItem.TYPE_SLIDER:
view = inflater.inflate(R.layout.list_item_setting, parent, false);
return new SliderViewHolder(view, this);
return new SliderViewHolder(view, this, mContext);
case SettingsItem.TYPE_SUBMENU:
view = inflater.inflate(R.layout.list_item_setting_submenu, parent, false);
@ -120,8 +117,7 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
return new ConfirmRunnableViewHolder(view, this, mContext, mView);
default:
Log.error("[SettingsAdapter] Invalid view type: " + viewType);
return null;
throw new IllegalArgumentException("Invalid view type: " + viewType);
}
}
@ -243,13 +239,13 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
builder.setPositiveButton(R.string.ok, this);
mDialog = builder.show();
mTextSliderValue = (TextView) view.findViewById(R.id.text_value);
mTextSliderValue = view.findViewById(R.id.text_value);
mTextSliderValue.setText(String.valueOf(mSeekbarProgress));
TextView units = (TextView) view.findViewById(R.id.text_units);
TextView units = view.findViewById(R.id.text_units);
units.setText(item.getUnits());
SeekBar seekbar = (SeekBar) view.findViewById(R.id.seekbar);
SeekBar seekbar = view.findViewById(R.id.seekbar);
seekbar.setMax(item.getMax());
seekbar.setProgress(mSeekbarProgress);
@ -273,21 +269,13 @@ public final class SettingsAdapter extends RecyclerView.Adapter<SettingViewHolde
mContext.getString(item.getNameId())));
dialog.setButton(AlertDialog.BUTTON_NEGATIVE, mContext.getString(R.string.cancel), this);
dialog.setButton(AlertDialog.BUTTON_NEUTRAL, mContext.getString(R.string.clear),
(dialogInterface, i) ->
{
SharedPreferences preferences =
PreferenceManager.getDefaultSharedPreferences(mContext);
item.clearValue();
});
(dialogInterface, i) -> item.clearValue());
dialog.setOnDismissListener(dialog1 ->
{
StringSetting setting = new StringSetting(item.getKey(), item.getSection(), item.getValue());
notifyItemChanged(position);
if (setting != null)
{
mView.putSetting(setting);
}
mView.putSetting(setting);
mView.onSettingChanged(item.getKey());
});

5
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java
View File

@ -3,6 +3,7 @@ package org.dolphinemu.dolphinemu.features.settings.ui;
import android.content.Context;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.LinearLayoutManager;
@ -84,7 +85,7 @@ public final class SettingsFragment extends Fragment implements SettingsFragment
}
@Override
public void onAttach(Context context)
public void onAttach(@NonNull Context context)
{
super.onAttach(context);
@ -115,7 +116,7 @@ public final class SettingsFragment extends Fragment implements SettingsFragment
}
@Override
public void onViewCreated(View view, @Nullable Bundle savedInstanceState)
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
{
Bundle args = getArguments();
MenuTag menuTag = (MenuTag) args.getSerializable(ARGUMENT_MENU_TAG);

6
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java
View File

@ -59,8 +59,8 @@ public final class SettingsFragmentPresenter
public void onCreate(MenuTag menuTag, String gameId, Bundle extras)
{
mGameID = gameId;
this.mMenuTag = menuTag;
if (menuTag.isGCPadMenu() || menuTag.isWiimoteExtensionMenu())
{
mControllerNumber = menuTag.getSubType();
@ -70,10 +70,6 @@ public final class SettingsFragmentPresenter
{
mControllerNumber = menuTag.getSubType();
}
else
{
mMenuTag = menuTag;
}
}
public void onViewCreated(MenuTag menuTag, Settings settings)

4
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFrameLayout.java
View File

@ -9,8 +9,6 @@ import android.widget.FrameLayout;
*/
public final class SettingsFrameLayout extends FrameLayout
{
private float mVisibleness = 1.0f;
public SettingsFrameLayout(Context context)
{
super(context);
@ -44,7 +42,7 @@ public final class SettingsFrameLayout extends FrameLayout
public float getVisibleness()
{
return mVisibleness;
return 1.0f;
}
public void setVisibleness(float visibleness)

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

@ -28,9 +28,9 @@ public final class CheckBoxSettingViewHolder extends SettingViewHolder
@Override
protected void findViews(View root)
{
mTextSettingName = (TextView) root.findViewById(R.id.text_setting_name);
mTextSettingDescription = (TextView) root.findViewById(R.id.text_setting_description);
mCheckbox = (CheckBox) root.findViewById(R.id.checkbox);
mTextSettingName = root.findViewById(R.id.text_setting_name);
mTextSettingDescription = root.findViewById(R.id.text_setting_description);
mCheckbox = root.findViewById(R.id.checkbox);
}
@Override

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

@ -35,8 +35,8 @@ public final class ConfirmRunnableViewHolder extends SettingViewHolder
@Override
protected void findViews(View root)
{
mTextSettingName = (TextView) root.findViewById(R.id.text_setting_name);
mTextSettingDescription = (TextView) root.findViewById(R.id.text_setting_description);
mTextSettingName = root.findViewById(R.id.text_setting_name);
mTextSettingDescription = root.findViewById(R.id.text_setting_description);
}
@Override
@ -78,9 +78,7 @@ public final class ConfirmRunnableViewHolder extends SettingViewHolder
mView.getActivity().finish();
})
.setNegativeButton("No", (dialog, whichButton) ->
{
dialog.dismiss();
});
dialog.dismiss());
builder.show();
}

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

@ -8,7 +8,6 @@ import org.dolphinemu.dolphinemu.R;
import org.dolphinemu.dolphinemu.features.settings.model.view.FilePicker;
import org.dolphinemu.dolphinemu.features.settings.model.view.SettingsItem;
import org.dolphinemu.dolphinemu.features.settings.ui.SettingsAdapter;
import org.dolphinemu.dolphinemu.features.settings.utils.SettingsFile;
import org.dolphinemu.dolphinemu.ui.main.MainPresenter;
public final class FilePickerViewHolder extends SettingViewHolder
@ -27,8 +26,8 @@ public final class FilePickerViewHolder extends SettingViewHolder
@Override
protected void findViews(View root)
{
mTextSettingName = (TextView) root.findViewById(R.id.text_setting_name);
mTextSettingDescription = (TextView) root.findViewById(R.id.text_setting_description);
mTextSettingName = root.findViewById(R.id.text_setting_name);
mTextSettingDescription = root.findViewById(R.id.text_setting_description);
}
@Override

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

@ -20,7 +20,7 @@ public final class HeaderViewHolder extends SettingViewHolder
@Override
protected void findViews(View root)
{
mHeaderName = (TextView) root.findViewById(R.id.text_header_name);
mHeaderName = root.findViewById(R.id.text_header_name);
}
@Override
@ -34,4 +34,4 @@ public final class HeaderViewHolder extends SettingViewHolder
{
// no-op
}
}
}

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

@ -30,8 +30,8 @@ public class RumbleBindingViewHolder extends SettingViewHolder
@Override
protected void findViews(View root)
{
mTextSettingName = (TextView) root.findViewById(R.id.text_setting_name);
mTextSettingDescription = (TextView) root.findViewById(R.id.text_setting_description);
mTextSettingName = root.findViewById(R.id.text_setting_name);
mTextSettingDescription = root.findViewById(R.id.text_setting_description);
}
@Override

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

@ -26,8 +26,8 @@ public final class SingleChoiceViewHolder extends SettingViewHolder
@Override
protected void findViews(View root)
{
mTextSettingName = (TextView) root.findViewById(R.id.text_setting_name);
mTextSettingDescription = (TextView) root.findViewById(R.id.text_setting_description);
mTextSettingName = root.findViewById(R.id.text_setting_name);
mTextSettingDescription = root.findViewById(R.id.text_setting_description);
}
@Override

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

@ -1,5 +1,6 @@
package org.dolphinemu.dolphinemu.features.settings.ui.viewholder;
import android.content.Context;
import android.view.View;
import android.widget.TextView;
@ -10,21 +11,25 @@ import org.dolphinemu.dolphinemu.features.settings.ui.SettingsAdapter;
public final class SliderViewHolder extends SettingViewHolder
{
private Context mContext;
private SliderSetting mItem;
private TextView mTextSettingName;
private TextView mTextSettingDescription;
public SliderViewHolder(View itemView, SettingsAdapter adapter)
public SliderViewHolder(View itemView, SettingsAdapter adapter, Context context)
{
super(itemView, adapter);
mContext = context;
}
@Override
protected void findViews(View root)
{
mTextSettingName = (TextView) root.findViewById(R.id.text_setting_name);
mTextSettingDescription = (TextView) root.findViewById(R.id.text_setting_description);
mTextSettingName = root.findViewById(R.id.text_setting_name);
mTextSettingDescription = root.findViewById(R.id.text_setting_description);
}
@Override
@ -40,7 +45,9 @@ public final class SliderViewHolder extends SettingViewHolder
}
else
{
mTextSettingDescription.setText(mItem.getSelectedValue() + mItem.getUnits());
mTextSettingDescription.setText(mContext
.getString(R.string.slider_setting_value, mItem.getSelectedValue(),
mItem.getUnits()));
}
}

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

@ -22,7 +22,7 @@ public final class SubmenuViewHolder extends SettingViewHolder
@Override
protected void findViews(View root)
{
mTextSettingName = (TextView) root.findViewById(R.id.text_setting_name);
mTextSettingName = root.findViewById(R.id.text_setting_name);
}
@Override

15
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/utils/SettingsFile.java
View File

@ -432,10 +432,8 @@ public final class SettingsFile
{
File ini = getSettingsFile(fileName);
PrintWriter writer = null;
try
try (PrintWriter writer = new PrintWriter(ini, "UTF-8"))
{
writer = new PrintWriter(ini, "UTF-8");
Set<String> keySet = sections.keySet();
Set<String> sortedKeySet = new TreeSet<>(keySet);
@ -459,13 +457,6 @@ public final class SettingsFile
if (view != null)
view.showToastMessage("Error saving " + fileName + ".ini: " + e.getMessage());
}
finally
{
if (writer != null)
{
writer.close();
}
}
}
public static void saveCustomGameSettings(final String gameId,
@ -534,14 +525,14 @@ public final class SettingsFile
DirectoryInitialization.copyFile(defautlWiiProfilePath, wiiConfigPath);
NativeLibrary.SetProfileSetting(profile, Settings.SECTION_PROFILE, "Device",
"Android/" + (Integer.valueOf(padId) + 4) + "/Touchscreen");
"Android/" + (Integer.parseInt(padId) + 4) + "/Touchscreen");
}
NativeLibrary.SetProfileSetting(profile, Settings.SECTION_PROFILE, key, value);
// Enable the profile
NativeLibrary.SetUserSetting(gameId, Settings.SECTION_CONTROLS,
KEY_WIIMOTE_PROFILE + (Integer.valueOf(padId) + 1), profile);
KEY_WIIMOTE_PROFILE + (Integer.parseInt(padId) + 1), profile);
}
private static String mapSectionNameFromIni(String generalSectionName)

12
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/EmulationFragment.java
View File

@ -6,6 +6,7 @@ import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
@ -54,7 +55,7 @@ public final class EmulationFragment extends Fragment implements SurfaceHolder.C
}
@Override
public void onAttach(Context context)
public void onAttach(@NonNull Context context)
{
super.onAttach(context);
@ -213,7 +214,7 @@ public final class EmulationFragment extends Fragment implements SurfaceHolder.C
}
@Override
public void surfaceCreated(SurfaceHolder holder)
public void surfaceCreated(@NonNull SurfaceHolder holder)
{
// We purposely don't do anything here.
// All work is done in surfaceChanged, which we are guaranteed to get even for surface creation.
@ -227,7 +228,7 @@ public final class EmulationFragment extends Fragment implements SurfaceHolder.C
}
@Override
public void surfaceDestroyed(SurfaceHolder holder)
public void surfaceDestroyed(@NonNull SurfaceHolder holder)
{
mEmulationState.clearSurface();
}
@ -447,7 +448,10 @@ public final class EmulationFragment extends Fragment implements SurfaceHolder.C
try
{
File file = new File(path);
file.delete();
if (!file.delete())
{
Log.error("[EmulationFragment] Failed to delete " + file.getAbsolutePath());
}
}
catch (Exception ignored)
{

4
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/MenuFragment.java
View File

@ -2,7 +2,6 @@ package org.dolphinemu.dolphinemu.fragments;
import android.os.Bundle;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;
import android.util.SparseIntArray;
@ -58,13 +57,12 @@ public final class MenuFragment extends Fragment implements View.OnClickListener
return fragment;
}
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
{
View rootView = inflater.inflate(R.layout.fragment_ingame_menu, container, false);
LinearLayout options = (LinearLayout) rootView.findViewById(R.id.layout_options);
LinearLayout options = rootView.findViewById(R.id.layout_options);
mPauseEmulation = options.findViewById(R.id.menu_pause_emulation);
mUnpauseEmulation = options.findViewById(R.id.menu_unpause_emulation);

3
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/fragments/SaveLoadStateFragment.java
View File

@ -80,13 +80,12 @@ public final class SaveLoadStateFragment extends Fragment implements View.OnClic
mSaveOrLoad = (SaveOrLoad) getArguments().getSerializable(KEY_SAVEORLOAD);
}
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
{
View rootView = inflater.inflate(R.layout.fragment_saveload_state, container, false);
GridLayout grid = (GridLayout) rootView.findViewById(R.id.grid_state_slots);
GridLayout grid = rootView.findViewById(R.id.grid_state_slots);
for (int childIndex = 0; childIndex < grid.getChildCount(); childIndex++)
{
Button button = (Button) grid.getChildAt(childIndex);

1
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameFile.java
View File

@ -1,7 +1,6 @@
package org.dolphinemu.dolphinemu.model;
import android.content.Context;
import android.os.Environment;
public class GameFile
{

20
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/GameFileCache.java
View File

@ -33,6 +33,12 @@ public class GameFileCache
{
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
Set<String> folderPaths = preferences.getStringSet(GAME_FOLDER_PATHS_PREFERENCE, EMPTY_SET);
if (folderPaths == null)
{
return;
}
Set<String> newFolderPaths = new HashSet<>(folderPaths);
newFolderPaths.add(path);
SharedPreferences.Editor editor = preferences.edit();
@ -44,6 +50,12 @@ public class GameFileCache
{
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
Set<String> folderPaths = preferences.getStringSet(GAME_FOLDER_PATHS_PREFERENCE, EMPTY_SET);
if (folderPaths == null)
{
return;
}
Set<String> newFolderPaths = new HashSet<>();
for (String folderPath : folderPaths)
{
@ -78,7 +90,13 @@ public class GameFileCache
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
Set<String> folderPathsSet = preferences.getStringSet(GAME_FOLDER_PATHS_PREFERENCE, EMPTY_SET);
String[] folderPaths = folderPathsSet.toArray(new String[folderPathsSet.size()]);
if (folderPathsSet == null)
{
return false;
}
String[] folderPaths = folderPathsSet.toArray(new String[0]);
boolean cacheChanged = update(folderPaths, recursiveScan);
cacheChanged |= updateAdditionalMetadata();

15
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlay.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright 2013 Dolphin Emulator Project
* Licensed under GPLv2+
* Refer to the license.txt file included.
@ -1075,14 +1075,13 @@ public final class InputOverlay extends SurfaceView implements OnTouchListener
// Decide inner scale based on joystick ID
float innerScale;
switch (joystick)
if (joystick == ButtonType.STICK_C)
{
case ButtonType.STICK_C:
innerScale = 1.833f;
break;
default:
innerScale = 1.375f;
break;
innerScale = 1.833f;
}
else
{
innerScale = 1.375f;
}
// Now set the bounds for the InputOverlayDrawableJoystick.

6
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableButton.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright 2013 Dolphin Emulator Project
* Licensed under GPLv2+
* Refer to the license.txt file included.
@ -70,7 +70,7 @@ public final class InputOverlayDrawableButton
return mTrackId;
}
public boolean onConfigureTouch(MotionEvent event)
public void onConfigureTouch(MotionEvent event)
{
int pointerIndex = event.getActionIndex();
int fingerPositionX = (int) event.getX(pointerIndex);
@ -89,9 +89,7 @@ public final class InputOverlayDrawableButton
mPreviousTouchX = fingerPositionX;
mPreviousTouchY = fingerPositionY;
break;
}
return true;
}
public void setPosition(int x, int y)

6
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableDpad.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright 2016 Dolphin Emulator Project
* Licensed under GPLv2+
* Refer to the license.txt file included.
@ -148,7 +148,7 @@ public final class InputOverlayDrawableDpad
return mTrackId;
}
public boolean onConfigureTouch(MotionEvent event)
public void onConfigureTouch(MotionEvent event)
{
int pointerIndex = event.getActionIndex();
int fingerPositionX = (int) event.getX(pointerIndex);
@ -167,9 +167,7 @@ public final class InputOverlayDrawableDpad
mPreviousTouchX = fingerPositionX;
mPreviousTouchY = fingerPositionY;
break;
}
return true;
}
public void setPosition(int x, int y)

5
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayDrawableJoystick.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright 2013 Dolphin Emulator Project
* Licensed under GPLv2+
* Refer to the license.txt file included.
@ -165,7 +165,7 @@ public final class InputOverlayDrawableJoystick
return pressed;
}
public boolean onConfigureTouch(MotionEvent event)
public void onConfigureTouch(MotionEvent event)
{
int pointerIndex = event.getActionIndex();
int fingerPositionX = (int) event.getX(pointerIndex);
@ -195,7 +195,6 @@ public final class InputOverlayDrawableJoystick
mPreviousTouchY = fingerPositionY;
break;
}
return true;
}

9
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/overlay/InputOverlayPointer.java
View File

@ -49,8 +49,8 @@ public class InputOverlayPointer
Integer x = outMetrics.widthPixels;
// Adjusting for device's black bars.
Float deviceAR = (float) x / y;
Float gameAR = NativeLibrary.GetGameAspectRatio();
float deviceAR = (float) x / y;
float gameAR = NativeLibrary.GetGameAspectRatio();
aspectAdjusted = gameAR / deviceAR;
if (gameAR <= deviceAR) // Black bars on left/right
@ -73,7 +73,7 @@ public class InputOverlayPointer
}
}
public boolean onTouch(MotionEvent event)
public void onTouch(MotionEvent event)
{
int pointerIndex = event.getActionIndex();
@ -92,7 +92,7 @@ public class InputOverlayPointer
}
if (trackId == -1)
return false;
return;
int x = (int) event.getX(event.findPointerIndex(trackId));
int y = (int) event.getY(event.findPointerIndex(trackId));
@ -106,7 +106,6 @@ public class InputOverlayPointer
axes[0] = ((y * aspectAdjusted) - maxHeight) / maxHeight;
axes[1] = (x - maxWidth) / maxWidth;
}
return false;
}
private void touchPress()

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/NVidiaShieldWorkaroundView.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright 2013 Dolphin Emulator Project
* Licensed under GPLv2+
* Refer to the license.txt file included.

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/CustomTitleView.java
View File

@ -53,7 +53,7 @@ public class CustomTitleView extends LinearLayout implements TitleViewAdapter.Pr
{
super(context, attrs, defStyle);
View root = LayoutInflater.from(context).inflate(R.layout.tv_title, this);
mTitleView = (TextView) root.findViewById(R.id.title);
mTitleView = root.findViewById(R.id.title);
mBadgeView = root.findViewById(R.id.badge);
}

42
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java
View File

@ -109,6 +109,10 @@ public final class MainActivity extends AppCompatActivity implements MainView
protected void onStop()
{
super.onStop();
if (isChangingConfigurations())
{
skipRescanningLibrary();
}
StartupHandler.setSessionTime(this);
}
@ -174,36 +178,34 @@ public final class MainActivity extends AppCompatActivity implements MainView
protected void onActivityResult(int requestCode, int resultCode, Intent result)
{
super.onActivityResult(requestCode, resultCode, result);
switch (requestCode)
// If the user picked a file, as opposed to just backing out.
if (resultCode == MainActivity.RESULT_OK)
{
case MainPresenter.REQUEST_DIRECTORY:
// If the user picked a file, as opposed to just backing out.
if (resultCode == MainActivity.RESULT_OK)
{
switch (requestCode)
{
case MainPresenter.REQUEST_DIRECTORY:
mPresenter.onDirectorySelected(FileBrowserHelper.getSelectedPath(result));
}
break;
break;
case MainPresenter.REQUEST_GAME_FILE:
// If the user picked a file, as opposed to just backing out.
if (resultCode == MainActivity.RESULT_OK)
{
case MainPresenter.REQUEST_GAME_FILE:
EmulationActivity.launchFile(this, FileBrowserHelper.getSelectedFiles(result));
}
break;
break;
case MainPresenter.REQUEST_WAD_FILE:
// If the user picked a file, as opposed to just backing out.
if (resultCode == MainActivity.RESULT_OK)
{
case MainPresenter.REQUEST_WAD_FILE:
mPresenter.installWAD(FileBrowserHelper.getSelectedPath(result));
}
break;
break;
}
}
else
{
skipRescanningLibrary();
}
}
@Override
public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults)
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
@NonNull int[] grantResults)
{
if (requestCode == PermissionsHandler.REQUEST_CODE_WRITE_PERMISSION)
{

80
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java
View File

@ -43,8 +43,6 @@ public final class TvMainActivity extends FragmentActivity implements MainView
private BrowseSupportFragment mBrowseFragment;
private ArrayObjectAdapter mRowsAdapter;
@Override
protected void onCreate(Bundle savedInstanceState)
{
@ -95,6 +93,10 @@ public final class TvMainActivity extends FragmentActivity implements MainView
protected void onStop()
{
super.onStop();
if (isChangingConfigurations())
{
skipRescanningLibrary();
}
StartupHandler.setSessionTime(this);
}
@ -187,31 +189,28 @@ public final class TvMainActivity extends FragmentActivity implements MainView
protected void onActivityResult(int requestCode, int resultCode, Intent result)
{
super.onActivityResult(requestCode, resultCode, result);
switch (requestCode)
// If the user picked a file, as opposed to just backing out.
if (resultCode == MainActivity.RESULT_OK)
{
case MainPresenter.REQUEST_DIRECTORY:
// If the user picked a file, as opposed to just backing out.
if (resultCode == MainActivity.RESULT_OK)
{
switch (requestCode)
{
case MainPresenter.REQUEST_DIRECTORY:
mPresenter.onDirectorySelected(FileBrowserHelper.getSelectedPath(result));
}
break;
break;
case MainPresenter.REQUEST_GAME_FILE:
// If the user picked a file, as opposed to just backing out.
if (resultCode == MainActivity.RESULT_OK)
{
case MainPresenter.REQUEST_GAME_FILE:
EmulationActivity.launchFile(this, FileBrowserHelper.getSelectedFiles(result));
}
break;
break;
case MainPresenter.REQUEST_WAD_FILE:
// If the user picked a file, as opposed to just backing out.
if (resultCode == MainActivity.RESULT_OK)
{
case MainPresenter.REQUEST_WAD_FILE:
mPresenter.installWAD(FileBrowserHelper.getSelectedPath(result));
}
break;
break;
}
}
else
{
skipRescanningLibrary();
}
}
@ -219,29 +218,28 @@ public final class TvMainActivity extends FragmentActivity implements MainView
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
@NonNull int[] grantResults)
{
switch (requestCode)
if (requestCode == PermissionsHandler.REQUEST_CODE_WRITE_PERMISSION)
{
case PermissionsHandler.REQUEST_CODE_WRITE_PERMISSION:
if (grantResults[0] == PackageManager.PERMISSION_GRANTED)
{
DirectoryInitialization.start(this);
GameFileCacheService.startLoad(this);
}
else
{
Toast.makeText(this, R.string.write_permission_needed, Toast.LENGTH_SHORT)
.show();
}
break;
default:
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
break;
if (grantResults[0] == PackageManager.PERMISSION_GRANTED)
{
DirectoryInitialization.start(this);
GameFileCacheService.startLoad(this);
}
else
{
Toast.makeText(this, R.string.write_permission_needed, Toast.LENGTH_SHORT)
.show();
}
}
else
{
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
}
}
private void buildRowsAdapter()
{
mRowsAdapter = new ArrayObjectAdapter(new ListRowPresenter());
ArrayObjectAdapter rowsAdapter = new ArrayObjectAdapter(new ListRowPresenter());
if (PermissionsHandler.hasWriteAccess(this))
{
@ -255,13 +253,13 @@ public final class TvMainActivity extends FragmentActivity implements MainView
// Add row to the adapter only if it is not empty.
if (row != null)
{
mRowsAdapter.add(row);
rowsAdapter.add(row);
}
}
mRowsAdapter.add(buildSettingsRow());
rowsAdapter.add(buildSettingsRow());
mBrowseFragment.setAdapter(mRowsAdapter);
mBrowseFragment.setAdapter(rowsAdapter);
}
private ListRow buildGamesRow(Platform platform, Collection<GameFile> gameFiles)

6
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/platform/PlatformGamesFragment.java
View File

@ -2,7 +2,7 @@ package org.dolphinemu.dolphinemu.ui.platform;
import android.os.Bundle;
import androidx.annotation.Nullable;
import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@ -50,7 +50,7 @@ public final class PlatformGamesFragment extends Fragment implements PlatformGam
}
@Override
public void onViewCreated(View view, Bundle savedInstanceState)
public void onViewCreated(@NonNull View view, Bundle savedInstanceState)
{
int columns = getResources().getInteger(R.integer.game_grid_columns);
RecyclerView.LayoutManager layoutManager = new GridLayoutManager(getActivity(), columns);
@ -88,6 +88,6 @@ public final class PlatformGamesFragment extends Fragment implements PlatformGam
private void findViews(View root)
{
mRecyclerView = (RecyclerView) root.findViewById(R.id.grid_games);
mRecyclerView = root.findViewById(R.id.grid_games);
}
}

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/AppLinkHelper.java
View File

@ -80,7 +80,7 @@ public class AppLinkHelper
private static long extractLong(Uri uri, int index)
{
return Long.valueOf(extract(uri, index));
return Long.parseLong(extract(uri, index));
}
private static String extract(Uri uri, int index)

6
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/BiMap.java
View File

@ -6,8 +6,8 @@ import java.util.Map;
public class BiMap<K, V>
{
private Map<K, V> forward = new HashMap<K, V>();
private Map<V, K> backward = new HashMap<V, K>();
private Map<K, V> forward = new HashMap<>();
private Map<V, K> backward = new HashMap<>();
public synchronized void add(K key, V value)
{
@ -24,4 +24,4 @@ public class BiMap<K, V>
{
return backward.get(key);
}
}
}

3
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/CoverHelper.java
View File

@ -8,10 +8,9 @@ import java.io.FileOutputStream;
public final class CoverHelper
{
private static String baseUrl = "https://art.gametdb.com/wii/cover/%s/%s.png";
public static String buildGameTDBUrl(GameFile game, String region)
{
String baseUrl = "https://art.gametdb.com/wii/cover/%s/%s.png";
return String.format(baseUrl, region, game.getGameTdbId());
}

22
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/DirectoryInitialization.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright 2014 Dolphin Emulator Project
* Licensed under GPLv2+
* Refer to the license.txt file included.
@ -267,12 +267,23 @@ public final class DirectoryInitialization
try
{
String[] assetList = context.getAssets().list(assetFolder);
if (assetList == null)
{
return;
}
boolean createdFolder = false;
for (String file : context.getAssets().list(assetFolder))
for (String file : assetList)
{
if (!createdFolder)
{
outputFolder.mkdir();
if (!outputFolder.mkdir())
{
Log.error("[DirectoryInitialization] Failed to create folder " +
outputFolder.getAbsolutePath());
}
createdFolder = true;
}
copyAssetFolder(assetFolder + File.separator + file, new File(outputFolder, file),
@ -317,7 +328,10 @@ public final class DirectoryInitialization
File wiiPath = new File(directory);
if (!wiiPath.isDirectory())
{
wiiPath.mkdirs();
if (!wiiPath.mkdirs())
{
Log.error("[DirectoryInitialization] Failed to create folder " + wiiPath.getAbsolutePath());
}
}
}

10
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/EGLHelper.java
View File

@ -1,4 +1,4 @@
/**
/*
* Copyright 2013 Dolphin Emulator Project
* Licensed under GPLv2+
* Refer to the license.txt file included.
@ -223,14 +223,14 @@ public final class EGLHelper
}
// Detects the specific kind of GL modes that are supported
private boolean detect()
private void detect()
{
// Get total number of configs available.
int[] numConfigs = new int[1];
if (!mEGL.eglGetConfigs(mDisplay, null, 0, numConfigs))
{
Log.error("[EGLHelper] Error retrieving number of EGL configs available.");
return false;
return;
}
// Now get all the configurations
@ -238,7 +238,7 @@ public final class EGLHelper
if (!mEGL.eglGetConfigs(mDisplay, mEGLConfigs, mEGLConfigs.length, numConfigs))
{
Log.error("[EGLHelper] Error retrieving all EGL configs.");
return false;
return;
}
for (EGLConfig mEGLConfig : mEGLConfigs)
@ -258,8 +258,6 @@ public final class EGLHelper
supportGLES3 = true;
}
}
return true;
}
// Creates the context and surface.

2
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/StartupHandler.java
View File

@ -77,7 +77,7 @@ public final class StartupHandler
if (currentTime > (lastOpen + SESSION_TIMEOUT))
{
new AfterDirectoryInitializationRunner().run(context,
() -> NativeLibrary.ReportStartToAnalytics());
NativeLibrary::ReportStartToAnalytics);
}
}
}

7
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/TvUtil.java
View File

@ -123,11 +123,10 @@ public class TvUtil
throws Resources.NotFoundException
{
Resources res = context.getResources();
Uri resUri = Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE +
return Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE +
"://" + res.getResourcePackageName(resId)
+ '/' + res.getResourceTypeName(resId)
+ '/' + res.getResourceEntryName(resId));
return resUri;
}
/**
@ -255,9 +254,7 @@ public class TvUtil
*/
public static List<HomeScreenChannel> createUniversalSubscriptions()
{
//Leaving the subs local variable in case more channels are created other than platforms.
List<HomeScreenChannel> subs = new ArrayList<>(createPlatformSubscriptions());
return subs;
return new ArrayList<>(createPlatformSubscriptions());
}
private static List<HomeScreenChannel> createPlatformSubscriptions()

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

@ -391,6 +391,7 @@
<string name="pitch">Total Pitch</string>
<string name="yaw">Total Yaw</string>
<string name="vertical_offset">Vertical Offset</string>
<string name="slider_setting_value">%1$d%2$s</string>
<string name="disc_number">Disc %1$d</string>
<string name="disabled_gc_overlay_notice">GameCube Controller 1 is set to \"None\"</string>