From bc044da12e3190043da706fc9afe62fb0037c3d8 Mon Sep 17 00:00:00 2001 From: FearlessTobi Date: Wed, 29 Apr 2020 06:49:37 +0200 Subject: [PATCH] android: Format code Finally makes us have consistent code format in the codebase. --- .../org/citra/citra_emu/CitraApplication.java | 3 +- .../org/citra/citra_emu/NativeLibrary.java | 3 +- .../activities/EmulationActivity.java | 26 +-- .../citra/citra_emu/applets/MiiSelector.java | 34 ++-- .../citra_emu/applets/SoftwareKeyboard.java | 106 ++++++------ .../camera/StillImageCameraHelper.java | 12 +- .../model/view/StringSingleChoiceSetting.java | 154 ++++++++---------- .../settings/ui/SettingsActivityView.java | 1 + .../PicassoRoundedCornersTransformation.java | 2 +- .../citra/citra_emu/utils/PicassoUtils.java | 1 + 10 files changed, 166 insertions(+), 176 deletions(-) diff --git a/src/android/app/src/main/java/org/citra/citra_emu/CitraApplication.java b/src/android/app/src/main/java/org/citra/citra_emu/CitraApplication.java index 478759b83..9d3f80465 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/CitraApplication.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/CitraApplication.java @@ -49,8 +49,7 @@ public class CitraApplication extends Application { databaseHelper = new GameDatabase(this); } - public static Context getAppContext() - { + public static Context getAppContext() { return application.getApplicationContext(); } } diff --git a/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.java b/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.java index e93306a69..fc7a9c562 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/NativeLibrary.java @@ -428,7 +428,8 @@ public final class NativeLibrary { synchronized (cameraPermissionLock) { try { cameraPermissionLock.wait(); - } catch (InterruptedException ignored) {} + } catch (InterruptedException ignored) { + } } return cameraPermissionGranted; } diff --git a/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java b/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java index 1636f46ef..bb4ac6516 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java @@ -243,19 +243,19 @@ public final class EmulationActivity extends AppCompatActivity { @Override public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { switch (requestCode) { - case NativeLibrary.REQUEST_CODE_NATIVE_CAMERA: - if (grantResults[0] != PackageManager.PERMISSION_GRANTED) { - new AlertDialog.Builder(this) - .setTitle(R.string.camera) - .setMessage(R.string.camera_permission_needed) - .setPositiveButton(android.R.string.ok, null) - .show(); - } - NativeLibrary.CameraPermissionResult(grantResults[0] == PackageManager.PERMISSION_GRANTED); - break; - default: - super.onRequestPermissionsResult(requestCode, permissions, grantResults); - break; + case NativeLibrary.REQUEST_CODE_NATIVE_CAMERA: + if (grantResults[0] != PackageManager.PERMISSION_GRANTED) { + new AlertDialog.Builder(this) + .setTitle(R.string.camera) + .setMessage(R.string.camera_permission_needed) + .setPositiveButton(android.R.string.ok, null) + .show(); + } + NativeLibrary.CameraPermissionResult(grantResults[0] == PackageManager.PERMISSION_GRANTED); + break; + default: + super.onRequestPermissionsResult(requestCode, permissions, grantResults); + break; } } diff --git a/src/android/app/src/main/java/org/citra/citra_emu/applets/MiiSelector.java b/src/android/app/src/main/java/org/citra/citra_emu/applets/MiiSelector.java index 858eab1c9..85b55b00d 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/applets/MiiSelector.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/applets/MiiSelector.java @@ -56,8 +56,8 @@ public final class MiiSelector { final Activity emulationActivity = Objects.requireNonNull(getActivity()); MiiSelectorConfig config = - Objects.requireNonNull((MiiSelectorConfig)Objects.requireNonNull(getArguments()) - .getSerializable("config")); + Objects.requireNonNull((MiiSelectorConfig) Objects.requireNonNull(getArguments()) + .getSerializable("config")); // Note: we intentionally leave out the Standard Mii in the native code so that // the string can get translated @@ -66,22 +66,24 @@ public final class MiiSelector { list.addAll(Arrays.asList(config.mii_names)); final int initialIndex = config.initially_selected_mii_index < list.size() - ? (int)config.initially_selected_mii_index - : 0; + ? (int) config.initially_selected_mii_index + : 0; data.index = initialIndex; AlertDialog.Builder builder = - new AlertDialog.Builder(emulationActivity) - .setTitle(config.title.isEmpty() - ? emulationActivity.getString(R.string.mii_selector) - : config.title) - .setSingleChoiceItems(list.toArray(new String[] {}), initialIndex, - (dialog, which) -> { data.index = which; }) - .setPositiveButton(android.R.string.ok, (dialog, which) -> { - data.return_code = 0; - synchronized (finishLock) { - finishLock.notifyAll(); - } - }); + new AlertDialog.Builder(emulationActivity) + .setTitle(config.title.isEmpty() + ? emulationActivity.getString(R.string.mii_selector) + : config.title) + .setSingleChoiceItems(list.toArray(new String[]{}), initialIndex, + (dialog, which) -> { + data.index = which; + }) + .setPositiveButton(android.R.string.ok, (dialog, which) -> { + data.return_code = 0; + synchronized (finishLock) { + finishLock.notifyAll(); + } + }); if (config.enable_cancel_button) { builder.setNegativeButton(android.R.string.cancel, (dialog, which) -> { data.return_code = 1; diff --git a/src/android/app/src/main/java/org/citra/citra_emu/applets/SoftwareKeyboard.java b/src/android/app/src/main/java/org/citra/citra_emu/applets/SoftwareKeyboard.java index 02e3f3882..a67cc9596 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/applets/SoftwareKeyboard.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/applets/SoftwareKeyboard.java @@ -60,7 +60,8 @@ public final class SoftwareKeyboard { public int max_text_length; public boolean multiline_mode; /// True if the keyboard accepts multiple lines of input public String hint_text; /// Displayed in the field as a hint before - @Nullable public String[] button_text; /// Contains the button text that the caller provides + @Nullable + public String[] button_text; /// Contains the button text that the caller provides } /// Corresponds to Frontend::KeyboardData @@ -79,8 +80,8 @@ public final class SoftwareKeyboard { public CharSequence filter(CharSequence source, int start, int end, Spanned dest, int dstart, int dend) { String text = new StringBuilder(dest) - .replace(dstart, dend, source.subSequence(start, end).toString()) - .toString(); + .replace(dstart, dend, source.subSequence(start, end).toString()) + .toString(); if (ValidateFilters(text) == ValidationError.None) { return null; // Accept replacement } @@ -104,52 +105,52 @@ public final class SoftwareKeyboard { assert emulationActivity != null; FrameLayout.LayoutParams params = new FrameLayout.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); + ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); params.leftMargin = params.rightMargin = - CitraApplication.getAppContext().getResources().getDimensionPixelSize( - R.dimen.dialog_margin); + CitraApplication.getAppContext().getResources().getDimensionPixelSize( + R.dimen.dialog_margin); KeyboardConfig config = Objects.requireNonNull( - (KeyboardConfig)Objects.requireNonNull(getArguments()).getSerializable("config")); + (KeyboardConfig) Objects.requireNonNull(getArguments()).getSerializable("config")); // Set up the input EditText editText = new EditText(CitraApplication.getAppContext()); editText.setHint(config.hint_text); editText.setSingleLine(!config.multiline_mode); editText.setLayoutParams(params); - editText.setFilters(new InputFilter[] { - new Filter(), new InputFilter.LengthFilter(config.max_text_length)}); + editText.setFilters(new InputFilter[]{ + new Filter(), new InputFilter.LengthFilter(config.max_text_length)}); FrameLayout container = new FrameLayout(emulationActivity); container.addView(editText); AlertDialog.Builder builder = new AlertDialog.Builder(emulationActivity) - .setTitle(R.string.software_keyboard) - .setView(container); + .setTitle(R.string.software_keyboard) + .setView(container); setCancelable(false); switch (config.button_config) { - case ButtonConfig.Triple: { - final String text = config.button_text == null - ? emulationActivity.getString(R.string.i_forgot) - : config.button_text[1]; - builder.setNeutralButton(text, null); - } - // fallthrough - case ButtonConfig.Dual: { - final String text = config.button_text == null - ? emulationActivity.getString(android.R.string.cancel) - : config.button_text[0]; - builder.setNegativeButton(text, null); - } - // fallthrough - case ButtonConfig.Single: { - final String text = config.button_text == null - ? emulationActivity.getString(android.R.string.ok) - : config.button_text[config.button_config]; - builder.setPositiveButton(text, null); - break; - } + case ButtonConfig.Triple: { + final String text = config.button_text == null + ? emulationActivity.getString(R.string.i_forgot) + : config.button_text[1]; + builder.setNeutralButton(text, null); + } + // fallthrough + case ButtonConfig.Dual: { + final String text = config.button_text == null + ? emulationActivity.getString(android.R.string.cancel) + : config.button_text[0]; + builder.setNegativeButton(text, null); + } + // fallthrough + case ButtonConfig.Single: { + final String text = config.button_text == null + ? emulationActivity.getString(android.R.string.ok) + : config.button_text[config.button_config]; + builder.setPositiveButton(text, null); + break; + } } final AlertDialog dialog = builder.create(); @@ -210,27 +211,27 @@ public final class SoftwareKeyboard { final EmulationActivity emulationActivity = NativeLibrary.sEmulationActivity.get(); String message = ""; switch (error) { - case FixedLengthRequired: - message = - emulationActivity.getString(R.string.fixed_length_required, config.max_text_length); - break; - case MaxLengthExceeded: - message = - emulationActivity.getString(R.string.max_length_exceeded, config.max_text_length); - break; - case BlankInputNotAllowed: - message = emulationActivity.getString(R.string.blank_input_not_allowed); - break; - case EmptyInputNotAllowed: - message = emulationActivity.getString(R.string.empty_input_not_allowed); - break; + case FixedLengthRequired: + message = + emulationActivity.getString(R.string.fixed_length_required, config.max_text_length); + break; + case MaxLengthExceeded: + message = + emulationActivity.getString(R.string.max_length_exceeded, config.max_text_length); + break; + case BlankInputNotAllowed: + message = emulationActivity.getString(R.string.blank_input_not_allowed); + break; + case EmptyInputNotAllowed: + message = emulationActivity.getString(R.string.empty_input_not_allowed); + break; } new AlertDialog.Builder(emulationActivity) - .setTitle(R.string.software_keyboard) - .setMessage(message) - .setPositiveButton(android.R.string.ok, null) - .show(); + .setTitle(R.string.software_keyboard) + .setMessage(message) + .setPositiveButton(android.R.string.ok, null) + .show(); } public static KeyboardData Execute(KeyboardConfig config) { @@ -253,10 +254,11 @@ public final class SoftwareKeyboard { public static void ShowError(String error) { NativeLibrary.displayAlertMsg( - CitraApplication.getAppContext().getResources().getString(R.string.software_keyboard), - error, false); + CitraApplication.getAppContext().getResources().getString(R.string.software_keyboard), + error, false); } private static native ValidationError ValidateFilters(String text); + private static native ValidationError ValidateInput(String text); } diff --git a/src/android/app/src/main/java/org/citra/citra_emu/camera/StillImageCameraHelper.java b/src/android/app/src/main/java/org/citra/citra_emu/camera/StillImageCameraHelper.java index 27ada5832..701cb0710 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/camera/StillImageCameraHelper.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/camera/StillImageCameraHelper.java @@ -19,10 +19,12 @@ import androidx.annotation.Nullable; public final class StillImageCameraHelper { public static final int REQUEST_CAMERA_FILE_PICKER = 1; private static final Object filePickerLock = new Object(); - private static @Nullable String filePickerPath; + private static @Nullable + String filePickerPath; // Opens file picker for camera. - public static @Nullable String OpenFilePicker() { + public static @Nullable + String OpenFilePicker() { final EmulationActivity emulationActivity = NativeLibrary.sEmulationActivity.get(); // At this point, we are assuming that we already have permissions as they are @@ -31,9 +33,9 @@ public final class StillImageCameraHelper { Intent intent = new Intent(Intent.ACTION_PICK); intent.setDataAndType(MediaStore.Images.Media.INTERNAL_CONTENT_URI, "image/*"); emulationActivity.startActivityForResult( - Intent.createChooser(intent, - emulationActivity.getString(R.string.camera_select_image)), - REQUEST_CAMERA_FILE_PICKER); + Intent.createChooser(intent, + emulationActivity.getString(R.string.camera_select_image)), + REQUEST_CAMERA_FILE_PICKER); }); synchronized (filePickerLock) { diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/StringSingleChoiceSetting.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/StringSingleChoiceSetting.java index 5716adc46..057145d9d 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/StringSingleChoiceSetting.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/StringSingleChoiceSetting.java @@ -3,98 +3,80 @@ package org.citra.citra_emu.features.settings.model.view; import org.citra.citra_emu.features.settings.model.Setting; import org.citra.citra_emu.features.settings.model.StringSetting; -public class StringSingleChoiceSetting extends SettingsItem -{ - private String mDefaultValue; +public class StringSingleChoiceSetting extends SettingsItem { + private String mDefaultValue; - private String[] mChoicesId; - private String[] mValuesId; + private String[] mChoicesId; + private String[] mValuesId; - public StringSingleChoiceSetting(String key, String section, int titleId, int descriptionId, - String[] choicesId, String[] valuesId, String defaultValue, Setting setting) - { - super(key, section, setting, titleId, descriptionId); - mValuesId = valuesId; - mChoicesId = choicesId; - mDefaultValue = defaultValue; - } - - public String[] getChoicesId() - { - return mChoicesId; - } - - public String[] getValuesId() - { - return mValuesId; - } - - public String getValueAt(int index) - { - if (mValuesId == null) - return null; - - if (index >= 0 && index < mValuesId.length) - { - return mValuesId[index]; + public StringSingleChoiceSetting(String key, String section, int titleId, int descriptionId, + String[] choicesId, String[] valuesId, String defaultValue, Setting setting) { + super(key, section, setting, titleId, descriptionId); + mValuesId = valuesId; + mChoicesId = choicesId; + mDefaultValue = defaultValue; } - return ""; - } - - public String getSelectedValue() - { - if (getSetting() != null) - { - StringSetting setting = (StringSetting) getSetting(); - return setting.getValue(); - } - else - { - return mDefaultValue; - } - } - - public int getSelectValueIndex() - { - String selectedValue = getSelectedValue(); - for (int i = 0; i < mValuesId.length; i++) - { - if (mValuesId[i].equals(selectedValue)) - { - return i; - } + public String[] getChoicesId() { + return mChoicesId; } - return -1; - } - - /** - * Write a value to the backing int. If that int was previously null, - * initializes a new one and returns it, so it can be added to the Hashmap. - * - * @param selection New value of the int. - * @return null if overwritten successfully otherwise; a newly created IntSetting. - */ - public StringSetting setSelectedValue(String selection) - { - if (getSetting() == null) - { - StringSetting setting = new StringSetting(getKey(), getSection(), selection); - setSetting(setting); - return setting; + public String[] getValuesId() { + return mValuesId; } - else - { - StringSetting setting = (StringSetting) getSetting(); - setting.setValue(selection); - return null; - } - } - @Override - public int getType() - { - return TYPE_STRING_SINGLE_CHOICE; - } + public String getValueAt(int index) { + if (mValuesId == null) + return null; + + if (index >= 0 && index < mValuesId.length) { + return mValuesId[index]; + } + + return ""; + } + + public String getSelectedValue() { + if (getSetting() != null) { + StringSetting setting = (StringSetting) getSetting(); + return setting.getValue(); + } else { + return mDefaultValue; + } + } + + public int getSelectValueIndex() { + String selectedValue = getSelectedValue(); + for (int i = 0; i < mValuesId.length; i++) { + if (mValuesId[i].equals(selectedValue)) { + return i; + } + } + + return -1; + } + + /** + * Write a value to the backing int. If that int was previously null, + * initializes a new one and returns it, so it can be added to the Hashmap. + * + * @param selection New value of the int. + * @return null if overwritten successfully otherwise; a newly created IntSetting. + */ + public StringSetting setSelectedValue(String selection) { + if (getSetting() == null) { + StringSetting setting = new StringSetting(getKey(), getSection(), selection); + setSetting(setting); + return setting; + } else { + StringSetting setting = (StringSetting) getSetting(); + setting.setValue(selection); + return null; + } + } + + @Override + public int getType() { + return TYPE_STRING_SINGLE_CHOICE; + } } diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityView.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityView.java index bfcc3d49c..eed454242 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityView.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityView.java @@ -4,6 +4,7 @@ import android.content.IntentFilter; import org.citra.citra_emu.features.settings.model.Settings; import org.citra.citra_emu.utils.DirectoryStateReceiver; + /** * Abstraction for the Activity that manages SettingsFragments. */ diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoRoundedCornersTransformation.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoRoundedCornersTransformation.java index cca71c135..10e4f7053 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoRoundedCornersTransformation.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoRoundedCornersTransformation.java @@ -30,7 +30,7 @@ public class PicassoRoundedCornersTransformation implements Transformation { paint.setAntiAlias(true); paint.setShader(shader); - canvas.drawRoundRect(new RectF(rect), 10,10, paint); + canvas.drawRoundRect(new RectF(rect), 10, 10, paint); squaredBitmap.recycle(); diff --git a/src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoUtils.java b/src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoUtils.java index 7d0cfdef7..f697d4ad2 100644 --- a/src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoUtils.java +++ b/src/android/app/src/main/java/org/citra/citra_emu/utils/PicassoUtils.java @@ -15,6 +15,7 @@ import androidx.annotation.Nullable; public class PicassoUtils { private static boolean mPicassoInitialized = false; + public static void init() { if (mPicassoInitialized) { return;