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

Android: Start structure the project around features instead of data types

Browse Source 
This only moves the settings feature, the rest will be moved slowely later.

Original commit by mahdihijazi for Dolphin-emu.
This commit is contained in:
FearlessTobi 2020-04-03 02:09:47 +02:00 committed by xperia64
parent 7ebd646594
commit 747423fa66
38 changed files with 131 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/android/app/src/main/AndroidManifest.xml
View File

@ -54,7 +54,7 @@
</activity>
<activity
android:name="org.citra.citra_emu.ui.settings.SettingsActivity"
android:name="org.citra.citra_emu.features.settings.ui.SettingsActivity"
android:configChanges="orientation|screenSize"
android:theme="@style/CitraSettings"
android:label="@string/preferences_settings"/>

6
src/android/app/src/main/java/org/citra/citra_emu/activities/EmulationActivity.java
View File

@ -35,11 +35,11 @@ import org.citra.citra_emu.NativeLibrary;
import org.citra.citra_emu.R;
import org.citra.citra_emu.fragments.EmulationFragment;
import org.citra.citra_emu.fragments.MenuFragment;
import org.citra.citra_emu.model.settings.view.InputBindingSetting;
import org.citra.citra_emu.ui.settings.SettingsActivity;
import org.citra.citra_emu.features.settings.model.view.InputBindingSetting;
import org.citra.citra_emu.features.settings.ui.SettingsActivity;
import org.citra.citra_emu.utils.ControllerMappingHelper;
import org.citra.citra_emu.utils.EmulationMenuSettings;
import org.citra.citra_emu.utils.SettingsFile;
import org.citra.citra_emu.features.settings.utils.SettingsFile;
import java.lang.annotation.Retention;
import java.util.List;

2
src/android/app/src/main/java/org/citra/citra_emu/dialogs/MotionAlertDialog.java
View File

@ -8,7 +8,7 @@ import android.view.InputDevice;
import android.view.KeyEvent;
import android.view.MotionEvent;
import org.citra.citra_emu.model.settings.view.InputBindingSetting;
import org.citra.citra_emu.features.settings.model.view.InputBindingSetting;
import org.citra.citra_emu.utils.Log;
import java.util.ArrayList;

2
src/android/app/src/main/java/org/citra/citra_emu/model/settings/BooleanSetting.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/BooleanSetting.java
View File

@ -1,4 +1,4 @@
package org.citra.citra_emu.model.settings;
package org.citra.citra_emu.features.settings.model;
public final class BooleanSetting extends Setting {
private boolean mValue;

2
src/android/app/src/main/java/org/citra/citra_emu/model/settings/FloatSetting.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/FloatSetting.java
View File

@ -1,4 +1,4 @@
package org.citra.citra_emu.model.settings;
package org.citra.citra_emu.features.settings.model;
public final class FloatSetting extends Setting {
private float mValue;

2
src/android/app/src/main/java/org/citra/citra_emu/model/settings/IntSetting.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/IntSetting.java
View File

@ -1,4 +1,4 @@
package org.citra.citra_emu.model.settings;
package org.citra.citra_emu.features.settings.model;
public final class IntSetting extends Setting {
private int mValue;

2
src/android/app/src/main/java/org/citra/citra_emu/model/settings/Setting.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/Setting.java
View File

@ -1,4 +1,4 @@
package org.citra.citra_emu.model.settings;
package org.citra.citra_emu.features.settings.model;
/**
* Abstraction for a setting item as read from / written to Citra's configuration ini files.

2
src/android/app/src/main/java/org/citra/citra_emu/model/settings/SettingSection.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/SettingSection.java
View File

@ -1,4 +1,4 @@
package org.citra.citra_emu.model.settings;
package org.citra.citra_emu.features.settings.model;
import java.util.HashMap;

2
src/android/app/src/main/java/org/citra/citra_emu/model/settings/StringSetting.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/StringSetting.java
View File

@ -1,4 +1,4 @@
package org.citra.citra_emu.model.settings;
package org.citra.citra_emu.features.settings.model;
public final class StringSetting extends Setting {
private String mValue;

8
src/android/app/src/main/java/org/citra/citra_emu/model/settings/view/CheckBoxSetting.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/CheckBoxSetting.java
View File

@ -1,8 +1,8 @@
package org.citra.citra_emu.model.settings.view;
package org.citra.citra_emu.features.settings.model.view;
import org.citra.citra_emu.model.settings.IntSetting;
import org.citra.citra_emu.model.settings.Setting;
import org.citra.citra_emu.ui.settings.SettingsFragmentView;
import org.citra.citra_emu.features.settings.model.IntSetting;
import org.citra.citra_emu.features.settings.model.Setting;
import org.citra.citra_emu.features.settings.ui.SettingsFragmentView;
public final class CheckBoxSetting extends SettingsItem {
private boolean mDefaultValue;

6
src/android/app/src/main/java/org/citra/citra_emu/model/settings/view/DateTimeSetting.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/DateTimeSetting.java
View File

@ -1,7 +1,7 @@
package org.citra.citra_emu.model.settings.view;
package org.citra.citra_emu.features.settings.model.view;
import org.citra.citra_emu.model.settings.Setting;
import org.citra.citra_emu.model.settings.StringSetting;
import org.citra.citra_emu.features.settings.model.Setting;
import org.citra.citra_emu.features.settings.model.StringSetting;
public final class DateTimeSetting extends SettingsItem {
private String mDefaultValue;

4
src/android/app/src/main/java/org/citra/citra_emu/model/settings/view/HeaderSetting.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/HeaderSetting.java
View File

@ -1,6 +1,6 @@
package org.citra.citra_emu.model.settings.view;
package org.citra.citra_emu.features.settings.model.view;
import org.citra.citra_emu.model.settings.Setting;
import org.citra.citra_emu.features.settings.model.Setting;
public final class HeaderSetting extends SettingsItem {
public HeaderSetting(String key, Setting setting, int titleId, int descriptionId) {

8
src/android/app/src/main/java/org/citra/citra_emu/model/settings/view/InputBindingSetting.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/InputBindingSetting.java
View File

@ -1,4 +1,4 @@
package org.citra.citra_emu.model.settings.view;
package org.citra.citra_emu.features.settings.model.view;
import android.content.SharedPreferences;
import android.preference.PreferenceManager;
@ -9,9 +9,9 @@ import android.widget.Toast;
import org.citra.citra_emu.NativeLibrary;
import org.citra.citra_emu.R;
import org.citra.citra_emu.CitraApplication;
import org.citra.citra_emu.model.settings.Setting;
import org.citra.citra_emu.model.settings.StringSetting;
import org.citra.citra_emu.utils.SettingsFile;
import org.citra.citra_emu.features.settings.model.Setting;
import org.citra.citra_emu.features.settings.model.StringSetting;
import org.citra.citra_emu.features.settings.utils.SettingsFile;
public final class InputBindingSetting extends SettingsItem {
private static final String INPUT_MAPPING_PREFIX = "InputMapping";

7
src/android/app/src/main/java/org/citra/citra_emu/model/settings/view/SettingsItem.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SettingsItem.java
View File

@ -1,6 +1,7 @@
package org.citra.citra_emu.model.settings.view;
package org.citra.citra_emu.features.settings.model.view;
import org.citra.citra_emu.model.settings.Setting;
import org.citra.citra_emu.features.settings.model.Setting;
import org.citra.citra_emu.features.settings.ui.SettingsAdapter;
/**
* ViewModel abstraction for an Item in the RecyclerView powering SettingsFragments.
@ -97,7 +98,7 @@ public abstract class SettingsItem {
}
/**
* Used by {@link org.citra.citra_emu.ui.settings.SettingsAdapter}'s onCreateViewHolder()
* Used by {@link SettingsAdapter}'s onCreateViewHolder()
* method to determine which type of ViewHolder should be created.
*
* @return An integer (ideally, one of the constants defined in this file)

6
src/android/app/src/main/java/org/citra/citra_emu/model/settings/view/SingleChoiceSetting.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SingleChoiceSetting.java
View File

@ -1,7 +1,7 @@
package org.citra.citra_emu.model.settings.view;
package org.citra.citra_emu.features.settings.model.view;
import org.citra.citra_emu.model.settings.IntSetting;
import org.citra.citra_emu.model.settings.Setting;
import org.citra.citra_emu.features.settings.model.IntSetting;
import org.citra.citra_emu.features.settings.model.Setting;
public final class SingleChoiceSetting extends SettingsItem {
private int mDefaultValue;

10
src/android/app/src/main/java/org/citra/citra_emu/model/settings/view/SliderSetting.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SliderSetting.java
View File

@ -1,10 +1,10 @@
package org.citra.citra_emu.model.settings.view;
package org.citra.citra_emu.features.settings.model.view;
import org.citra.citra_emu.model.settings.FloatSetting;
import org.citra.citra_emu.model.settings.IntSetting;
import org.citra.citra_emu.model.settings.Setting;
import org.citra.citra_emu.features.settings.model.FloatSetting;
import org.citra.citra_emu.features.settings.model.IntSetting;
import org.citra.citra_emu.features.settings.model.Setting;
import org.citra.citra_emu.utils.Log;
import org.citra.citra_emu.utils.SettingsFile;
import org.citra.citra_emu.features.settings.utils.SettingsFile;
public final class SliderSetting extends SettingsItem {
private int mMin;

4
src/android/app/src/main/java/org/citra/citra_emu/model/settings/view/SubmenuSetting.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/model/view/SubmenuSetting.java
View File

@ -1,6 +1,6 @@
package org.citra.citra_emu.model.settings.view;
package org.citra.citra_emu.features.settings.model.view;
import org.citra.citra_emu.model.settings.Setting;
import org.citra.citra_emu.features.settings.model.Setting;
public final class SubmenuSetting extends SettingsItem {
private String mMenuKey;

4
src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsActivity.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivity.java
View File

@ -1,4 +1,4 @@
package org.citra.citra_emu.ui.settings;
package org.citra.citra_emu.features.settings.ui;
import android.app.ProgressDialog;
import android.content.Context;
@ -18,7 +18,7 @@ import android.view.MenuItem;
import android.widget.Toast;
import org.citra.citra_emu.R;
import org.citra.citra_emu.model.settings.SettingSection;
import org.citra.citra_emu.features.settings.model.SettingSection;
import org.citra.citra_emu.utils.DirectoryInitialization;
import org.citra.citra_emu.utils.DirectoryStateReceiver;

6
src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsActivityPresenter.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityPresenter.java
View File

@ -1,16 +1,16 @@
package org.citra.citra_emu.ui.settings;
package org.citra.citra_emu.features.settings.ui;
import android.content.IntentFilter;
import android.os.Bundle;
import android.text.TextUtils;
import org.citra.citra_emu.NativeLibrary;
import org.citra.citra_emu.model.settings.SettingSection;
import org.citra.citra_emu.features.settings.model.SettingSection;
import org.citra.citra_emu.utils.DirectoryInitialization;
import org.citra.citra_emu.utils.DirectoryInitialization.DirectoryInitializationState;
import org.citra.citra_emu.utils.DirectoryStateReceiver;
import org.citra.citra_emu.utils.Log;
import org.citra.citra_emu.utils.SettingsFile;
import org.citra.citra_emu.features.settings.utils.SettingsFile;
import java.io.File;
import java.util.ArrayList;

4
src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsActivityView.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsActivityView.java
View File

@ -1,8 +1,8 @@
package org.citra.citra_emu.ui.settings;
package org.citra.citra_emu.features.settings.ui;
import android.content.IntentFilter;
import org.citra.citra_emu.model.settings.SettingSection;
import org.citra.citra_emu.features.settings.model.SettingSection;
import org.citra.citra_emu.utils.DirectoryStateReceiver;
import java.util.ArrayList;

38
src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsAdapter.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsAdapter.java
View File

@ -1,4 +1,4 @@
package org.citra.citra_emu.ui.settings;
package org.citra.citra_emu.features.settings.ui;
import android.content.Context;
import android.content.DialogInterface;
@ -14,24 +14,24 @@ import android.widget.TextView;
import org.citra.citra_emu.R;
import org.citra.citra_emu.dialogs.MotionAlertDialog;
import org.citra.citra_emu.model.settings.FloatSetting;
import org.citra.citra_emu.model.settings.IntSetting;
import org.citra.citra_emu.model.settings.StringSetting;
import org.citra.citra_emu.model.settings.view.CheckBoxSetting;
import org.citra.citra_emu.model.settings.view.DateTimeSetting;
import org.citra.citra_emu.model.settings.view.InputBindingSetting;
import org.citra.citra_emu.model.settings.view.SettingsItem;
import org.citra.citra_emu.model.settings.view.SingleChoiceSetting;
import org.citra.citra_emu.model.settings.view.SliderSetting;
import org.citra.citra_emu.model.settings.view.SubmenuSetting;
import org.citra.citra_emu.ui.settings.viewholder.CheckBoxSettingViewHolder;
import org.citra.citra_emu.ui.settings.viewholder.DateTimeViewHolder;
import org.citra.citra_emu.ui.settings.viewholder.HeaderViewHolder;
import org.citra.citra_emu.ui.settings.viewholder.InputBindingSettingViewHolder;
import org.citra.citra_emu.ui.settings.viewholder.SettingViewHolder;
import org.citra.citra_emu.ui.settings.viewholder.SingleChoiceViewHolder;
import org.citra.citra_emu.ui.settings.viewholder.SliderViewHolder;
import org.citra.citra_emu.ui.settings.viewholder.SubmenuViewHolder;
import org.citra.citra_emu.features.settings.model.FloatSetting;
import org.citra.citra_emu.features.settings.model.IntSetting;
import org.citra.citra_emu.features.settings.model.StringSetting;
import org.citra.citra_emu.features.settings.model.view.CheckBoxSetting;
import org.citra.citra_emu.features.settings.model.view.DateTimeSetting;
import org.citra.citra_emu.features.settings.model.view.InputBindingSetting;
import org.citra.citra_emu.features.settings.model.view.SettingsItem;
import org.citra.citra_emu.features.settings.model.view.SingleChoiceSetting;
import org.citra.citra_emu.features.settings.model.view.SliderSetting;
import org.citra.citra_emu.features.settings.model.view.SubmenuSetting;
import org.citra.citra_emu.features.settings.ui.viewholder.CheckBoxSettingViewHolder;
import org.citra.citra_emu.features.settings.ui.viewholder.DateTimeViewHolder;
import org.citra.citra_emu.features.settings.ui.viewholder.HeaderViewHolder;
import org.citra.citra_emu.features.settings.ui.viewholder.InputBindingSettingViewHolder;
import org.citra.citra_emu.features.settings.ui.viewholder.SettingViewHolder;
import org.citra.citra_emu.features.settings.ui.viewholder.SingleChoiceViewHolder;
import org.citra.citra_emu.features.settings.ui.viewholder.SliderViewHolder;
import org.citra.citra_emu.features.settings.ui.viewholder.SubmenuViewHolder;
import org.citra.citra_emu.utils.Log;
import java.util.ArrayList;

11
src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsFragment.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragment.java
View File

@ -1,6 +1,5 @@
package org.citra.citra_emu.ui.settings;
package org.citra.citra_emu.features.settings.ui;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
import androidx.annotation.Nullable;
@ -12,11 +11,11 @@ import android.view.View;
import android.view.ViewGroup;
import org.citra.citra_emu.R;
import org.citra.citra_emu.model.settings.Setting;
import org.citra.citra_emu.model.settings.SettingSection;
import org.citra.citra_emu.model.settings.view.SettingsItem;
import org.citra.citra_emu.features.settings.model.Setting;
import org.citra.citra_emu.features.settings.model.SettingSection;
import org.citra.citra_emu.features.settings.model.view.SettingsItem;
import org.citra.citra_emu.ui.DividerItemDecoration;
import org.citra.citra_emu.utils.SettingsFile;
import org.citra.citra_emu.features.settings.utils.SettingsFile;
import java.util.ArrayList;
import java.util.HashMap;

24
src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsFragmentPresenter.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.java
View File

@ -1,19 +1,19 @@
package org.citra.citra_emu.ui.settings;
package org.citra.citra_emu.features.settings.ui;
import android.text.TextUtils;
import org.citra.citra_emu.R;
import org.citra.citra_emu.model.settings.Setting;
import org.citra.citra_emu.model.settings.SettingSection;
import org.citra.citra_emu.model.settings.view.CheckBoxSetting;
import org.citra.citra_emu.model.settings.view.DateTimeSetting;
import org.citra.citra_emu.model.settings.view.HeaderSetting;
import org.citra.citra_emu.model.settings.view.InputBindingSetting;
import org.citra.citra_emu.model.settings.view.SettingsItem;
import org.citra.citra_emu.model.settings.view.SingleChoiceSetting;
import org.citra.citra_emu.model.settings.view.SliderSetting;
import org.citra.citra_emu.model.settings.view.SubmenuSetting;
import org.citra.citra_emu.utils.SettingsFile;
import org.citra.citra_emu.features.settings.model.Setting;
import org.citra.citra_emu.features.settings.model.SettingSection;
import org.citra.citra_emu.features.settings.model.view.CheckBoxSetting;
import org.citra.citra_emu.features.settings.model.view.DateTimeSetting;
import org.citra.citra_emu.features.settings.model.view.HeaderSetting;
import org.citra.citra_emu.features.settings.model.view.InputBindingSetting;
import org.citra.citra_emu.features.settings.model.view.SettingsItem;
import org.citra.citra_emu.features.settings.model.view.SingleChoiceSetting;
import org.citra.citra_emu.features.settings.model.view.SliderSetting;
import org.citra.citra_emu.features.settings.model.view.SubmenuSetting;
import org.citra.citra_emu.features.settings.utils.SettingsFile;
import java.util.ArrayList;
import java.util.HashMap;

8
src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsFragmentView.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentView.java
View File

@ -1,10 +1,10 @@
package org.citra.citra_emu.ui.settings;
package org.citra.citra_emu.features.settings.ui;
import androidx.fragment.app.FragmentActivity;
import org.citra.citra_emu.model.settings.Setting;
import org.citra.citra_emu.model.settings.SettingSection;
import org.citra.citra_emu.model.settings.view.SettingsItem;
import org.citra.citra_emu.features.settings.model.Setting;
import org.citra.citra_emu.features.settings.model.SettingSection;
import org.citra.citra_emu.features.settings.model.view.SettingsItem;
import java.util.ArrayList;
import java.util.HashMap;

2
src/android/app/src/main/java/org/citra/citra_emu/ui/settings/SettingsFrameLayout.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFrameLayout.java
View File

@ -1,4 +1,4 @@
package org.citra.citra_emu.ui.settings;
package org.citra.citra_emu.features.settings.ui;
import android.content.Context;
import android.util.AttributeSet;

8
src/android/app/src/main/java/org/citra/citra_emu/ui/settings/viewholder/CheckBoxSettingViewHolder.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/CheckBoxSettingViewHolder.java
View File

@ -1,13 +1,13 @@
package org.citra.citra_emu.ui.settings.viewholder;
package org.citra.citra_emu.features.settings.ui.viewholder;
import android.view.View;
import android.widget.CheckBox;
import android.widget.TextView;
import org.citra.citra_emu.R;
import org.citra.citra_emu.model.settings.view.CheckBoxSetting;
import org.citra.citra_emu.model.settings.view.SettingsItem;
import org.citra.citra_emu.ui.settings.SettingsAdapter;
import org.citra.citra_emu.features.settings.model.view.CheckBoxSetting;
import org.citra.citra_emu.features.settings.model.view.SettingsItem;
import org.citra.citra_emu.features.settings.ui.SettingsAdapter;
public final class CheckBoxSettingViewHolder extends SettingViewHolder {
private CheckBoxSetting mItem;

8
src/android/app/src/main/java/org/citra/citra_emu/ui/settings/viewholder/DateTimeViewHolder.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/DateTimeViewHolder.java
View File

@ -1,12 +1,12 @@
package org.citra.citra_emu.ui.settings.viewholder;
package org.citra.citra_emu.features.settings.ui.viewholder;
import android.view.View;
import android.widget.TextView;
import org.citra.citra_emu.R;
import org.citra.citra_emu.model.settings.view.DateTimeSetting;
import org.citra.citra_emu.model.settings.view.SettingsItem;
import org.citra.citra_emu.ui.settings.SettingsAdapter;
import org.citra.citra_emu.features.settings.model.view.DateTimeSetting;
import org.citra.citra_emu.features.settings.model.view.SettingsItem;
import org.citra.citra_emu.features.settings.ui.SettingsAdapter;
import org.citra.citra_emu.utils.Log;
public final class DateTimeViewHolder extends SettingViewHolder {

6
src/android/app/src/main/java/org/citra/citra_emu/ui/settings/viewholder/HeaderViewHolder.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/HeaderViewHolder.java
View File

@ -1,11 +1,11 @@
package org.citra.citra_emu.ui.settings.viewholder;
package org.citra.citra_emu.features.settings.ui.viewholder;
import android.view.View;
import android.widget.TextView;
import org.citra.citra_emu.R;
import org.citra.citra_emu.model.settings.view.SettingsItem;
import org.citra.citra_emu.ui.settings.SettingsAdapter;
import org.citra.citra_emu.features.settings.model.view.SettingsItem;
import org.citra.citra_emu.features.settings.ui.SettingsAdapter;
public final class HeaderViewHolder extends SettingViewHolder {
private TextView mHeaderName;

8
src/android/app/src/main/java/org/citra/citra_emu/ui/settings/viewholder/InputBindingSettingViewHolder.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/InputBindingSettingViewHolder.java
View File

@ -1,4 +1,4 @@
package org.citra.citra_emu.ui.settings.viewholder;
package org.citra.citra_emu.features.settings.ui.viewholder;
import android.content.Context;
import android.content.SharedPreferences;
@ -7,9 +7,9 @@ import android.view.View;
import android.widget.TextView;
import org.citra.citra_emu.R;
import org.citra.citra_emu.model.settings.view.InputBindingSetting;
import org.citra.citra_emu.model.settings.view.SettingsItem;
import org.citra.citra_emu.ui.settings.SettingsAdapter;
import org.citra.citra_emu.features.settings.model.view.InputBindingSetting;
import org.citra.citra_emu.features.settings.model.view.SettingsItem;
import org.citra.citra_emu.features.settings.ui.SettingsAdapter;
public final class InputBindingSettingViewHolder extends SettingViewHolder {
private InputBindingSetting mItem;

6
src/android/app/src/main/java/org/citra/citra_emu/ui/settings/viewholder/SettingViewHolder.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SettingViewHolder.java
View File

@ -1,10 +1,10 @@
package org.citra.citra_emu.ui.settings.viewholder;
package org.citra.citra_emu.features.settings.ui.viewholder;
import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import org.citra.citra_emu.model.settings.view.SettingsItem;
import org.citra.citra_emu.ui.settings.SettingsAdapter;
import org.citra.citra_emu.features.settings.model.view.SettingsItem;
import org.citra.citra_emu.features.settings.ui.SettingsAdapter;
public abstract class SettingViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
private SettingsAdapter mAdapter;

8
src/android/app/src/main/java/org/citra/citra_emu/ui/settings/viewholder/SingleChoiceViewHolder.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SingleChoiceViewHolder.java
View File

@ -1,13 +1,13 @@
package org.citra.citra_emu.ui.settings.viewholder;
package org.citra.citra_emu.features.settings.ui.viewholder;
import android.content.res.Resources;
import android.view.View;
import android.widget.TextView;
import org.citra.citra_emu.R;
import org.citra.citra_emu.model.settings.view.SettingsItem;
import org.citra.citra_emu.model.settings.view.SingleChoiceSetting;
import org.citra.citra_emu.ui.settings.SettingsAdapter;
import org.citra.citra_emu.features.settings.model.view.SettingsItem;
import org.citra.citra_emu.features.settings.model.view.SingleChoiceSetting;
import org.citra.citra_emu.features.settings.ui.SettingsAdapter;
public final class SingleChoiceViewHolder extends SettingViewHolder {
private SettingsItem mItem;

8
src/android/app/src/main/java/org/citra/citra_emu/ui/settings/viewholder/SliderViewHolder.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SliderViewHolder.java
View File

@ -1,12 +1,12 @@
package org.citra.citra_emu.ui.settings.viewholder;
package org.citra.citra_emu.features.settings.ui.viewholder;
import android.view.View;
import android.widget.TextView;
import org.citra.citra_emu.R;
import org.citra.citra_emu.model.settings.view.SettingsItem;
import org.citra.citra_emu.model.settings.view.SliderSetting;
import org.citra.citra_emu.ui.settings.SettingsAdapter;
import org.citra.citra_emu.features.settings.model.view.SettingsItem;
import org.citra.citra_emu.features.settings.model.view.SliderSetting;
import org.citra.citra_emu.features.settings.ui.SettingsAdapter;
public final class SliderViewHolder extends SettingViewHolder {
private SliderSetting mItem;

8
src/android/app/src/main/java/org/citra/citra_emu/ui/settings/viewholder/SubmenuViewHolder.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/viewholder/SubmenuViewHolder.java
View File

@ -1,12 +1,12 @@
package org.citra.citra_emu.ui.settings.viewholder;
package org.citra.citra_emu.features.settings.ui.viewholder;
import android.view.View;
import android.widget.TextView;
import org.citra.citra_emu.R;
import org.citra.citra_emu.model.settings.view.SettingsItem;
import org.citra.citra_emu.model.settings.view.SubmenuSetting;
import org.citra.citra_emu.ui.settings.SettingsAdapter;
import org.citra.citra_emu.features.settings.model.view.SettingsItem;
import org.citra.citra_emu.features.settings.model.view.SubmenuSetting;
import org.citra.citra_emu.features.settings.ui.SettingsAdapter;
public final class SubmenuViewHolder extends SettingViewHolder {
private SubmenuSetting mItem;

16
src/android/app/src/main/java/org/citra/citra_emu/utils/SettingsFile.java → src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.java
View File

@ -1,13 +1,15 @@
package org.citra.citra_emu.utils;
package org.citra.citra_emu.features.settings.utils;
import androidx.annotation.NonNull;
import org.citra.citra_emu.model.settings.FloatSetting;
import org.citra.citra_emu.model.settings.IntSetting;
import org.citra.citra_emu.model.settings.Setting;
import org.citra.citra_emu.model.settings.SettingSection;
import org.citra.citra_emu.model.settings.StringSetting;
import org.citra.citra_emu.ui.settings.SettingsActivityView;
import org.citra.citra_emu.features.settings.model.FloatSetting;
import org.citra.citra_emu.features.settings.model.IntSetting;
import org.citra.citra_emu.features.settings.model.Setting;
import org.citra.citra_emu.features.settings.model.SettingSection;
import org.citra.citra_emu.features.settings.model.StringSetting;
import org.citra.citra_emu.features.settings.ui.SettingsActivityView;
import org.citra.citra_emu.utils.DirectoryInitialization;
import org.citra.citra_emu.utils.Log;
import org.ini4j.Wini;
import java.io.BufferedReader;

5
src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainActivity.java
View File

@ -4,7 +4,7 @@ import android.content.Intent;
import android.content.pm.PackageManager;
import android.database.Cursor;
import android.os.Bundle;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import android.view.Menu;
@ -17,8 +17,7 @@ import org.citra.citra_emu.activities.EmulationActivity;
import org.citra.citra_emu.model.GameProvider;
import org.citra.citra_emu.utils.DirectoryInitialization;
import org.citra.citra_emu.ui.platform.PlatformGamesFragment;
import org.citra.citra_emu.ui.platform.PlatformGamesView;
import org.citra.citra_emu.ui.settings.SettingsActivity;
import org.citra.citra_emu.features.settings.ui.SettingsActivity;
import org.citra.citra_emu.utils.AddDirectoryHelper;
import org.citra.citra_emu.utils.FileBrowserHelper;
import org.citra.citra_emu.utils.PermissionsHandler;

2
src/android/app/src/main/java/org/citra/citra_emu/ui/main/MainPresenter.java
View File

@ -6,7 +6,7 @@ import org.citra.citra_emu.CitraApplication;
import org.citra.citra_emu.R;
import org.citra.citra_emu.model.GameDatabase;
import org.citra.citra_emu.utils.AddDirectoryHelper;
import org.citra.citra_emu.utils.SettingsFile;
import org.citra.citra_emu.features.settings.utils.SettingsFile;
import rx.android.schedulers.AndroidSchedulers;
import rx.schedulers.Schedulers;

3
src/android/app/src/main/java/org/citra/citra_emu/ui/main/TvMainActivity.java
View File

@ -6,7 +6,6 @@ import android.database.Cursor;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.leanback.app.BrowseFragment;
import androidx.leanback.app.BrowseSupportFragment;
import androidx.leanback.database.CursorMapper;
import androidx.leanback.widget.ArrayObjectAdapter;
@ -27,7 +26,7 @@ import org.citra.citra_emu.adapters.SettingsRowPresenter;
import org.citra.citra_emu.model.Game;
import org.citra.citra_emu.model.TvSettingsItem;
import org.citra.citra_emu.utils.DirectoryInitialization;
import org.citra.citra_emu.ui.settings.SettingsActivity;
import org.citra.citra_emu.features.settings.ui.SettingsActivity;
import org.citra.citra_emu.utils.AddDirectoryHelper;
import org.citra.citra_emu.utils.FileBrowserHelper;
import org.citra.citra_emu.utils.PermissionsHandler;

4
src/android/app/src/main/res/layout/fragment_settings.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<org.citra.citra_emu.ui.settings.SettingsFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<org.citra.citra_emu.features.settings.ui.SettingsFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
@ -9,4 +9,4 @@
android:layout_height="match_parent"
android:background="?android:attr/colorBackground" />
</org.citra.citra_emu.ui.settings.SettingsFrameLayout>
</org.citra.citra_emu.features.settings.ui.SettingsFrameLayout>