From 61835a7e0839b50b1fd9180b3aaad6fd8d9fa56b Mon Sep 17 00:00:00 2001 From: mahdihijazi Date: Mon, 23 Jul 2018 21:57:24 +0200 Subject: [PATCH] Android: Start structure the project around features instead of data types This only moves the settings feature, the rest will be moved slowely later --- .../Android/app/src/main/AndroidManifest.xml | 2 +- .../dolphinemu/adapters/GameAdapter.java | 4 +- .../dolphinemu/adapters/GameRowPresenter.java | 4 +- .../dolphinemu/dialogs/MotionAlertDialog.java | 2 +- .../settings/model}/BooleanSetting.java | 2 +- .../settings/model}/FloatSetting.java | 2 +- .../settings/model}/IntSetting.java | 4 +- .../settings/model}/Setting.java | 2 +- .../settings/model}/SettingSection.java | 2 +- .../settings/model}/StringSetting.java | 2 +- .../settings/model}/view/CheckBoxSetting.java | 6 +-- .../settings/model}/view/HeaderSetting.java | 4 +- .../model}/view/InputBindingSetting.java | 7 ++-- .../settings/model}/view/SettingsItem.java | 7 ++-- .../model}/view/SingleChoiceSetting.java | 8 ++-- .../settings/model}/view/SliderSetting.java | 8 ++-- .../view/StringSingleChoiceSetting.java | 6 +-- .../settings/model}/view/SubmenuSetting.java | 6 +-- .../settings/ui}/MenuTag.java | 2 +- .../settings/ui}/SettingsActivity.java | 5 +-- .../ui}/SettingsActivityPresenter.java | 6 +-- .../settings/ui}/SettingsActivityView.java | 4 +- .../settings/ui}/SettingsAdapter.java | 38 +++++++++---------- .../settings/ui}/SettingsFragment.java | 8 ++-- .../ui}/SettingsFragmentPresenter.java | 28 +++++++------- .../settings/ui}/SettingsFragmentView.java | 8 ++-- .../settings/ui}/SettingsFrameLayout.java | 2 +- .../viewholder/CheckBoxSettingViewHolder.java | 8 ++-- .../ui}/viewholder/HeaderViewHolder.java | 6 +-- .../InputBindingSettingViewHolder.java | 8 ++-- .../ui}/viewholder/SettingViewHolder.java | 6 +-- .../viewholder/SingleChoiceViewHolder.java | 10 ++--- .../ui}/viewholder/SliderViewHolder.java | 8 ++-- .../ui}/viewholder/SubmenuViewHolder.java | 8 ++-- .../dolphinemu/ui/main/MainActivity.java | 4 +- .../dolphinemu/ui/main/MainPresenter.java | 2 +- .../dolphinemu/ui/main/MainView.java | 2 +- .../dolphinemu/ui/main/TvMainActivity.java | 4 +- .../dolphinemu/utils/SettingsFile.java | 14 +++---- .../src/main/res/layout/fragment_settings.xml | 8 ++-- 40 files changed, 132 insertions(+), 135 deletions(-) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{model/settings => features/settings/model}/BooleanSetting.java (87%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{model/settings => features/settings/model}/FloatSetting.java (87%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{model/settings => features/settings/model}/IntSetting.java (83%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{model/settings => features/settings/model}/Setting.java (95%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{model/settings => features/settings/model}/SettingSection.java (95%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{model/settings => features/settings/model}/StringSetting.java (86%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{model/settings => features/settings/model}/view/CheckBoxSetting.java (85%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{model/settings => features/settings/model}/view/HeaderSetting.java (68%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{model/settings => features/settings/model}/view/InputBindingSetting.java (82%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{model/settings => features/settings/model}/view/SettingsItem.java (91%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{model/settings => features/settings/model}/view/SingleChoiceSetting.java (87%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{model/settings => features/settings/model}/view/SliderSetting.java (90%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{model/settings => features/settings/model}/view/StringSingleChoiceSetting.java (91%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{model/settings => features/settings/model}/view/SubmenuSetting.java (67%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{ui/settings => features/settings/ui}/MenuTag.java (97%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{ui/settings => features/settings/ui}/SettingsActivity.java (97%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{ui/settings => features/settings/ui}/SettingsActivityPresenter.java (97%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{ui/settings => features/settings/ui}/SettingsActivityView.java (96%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{ui/settings => features/settings/ui}/SettingsAdapter.java (88%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{ui/settings => features/settings/ui}/SettingsFragment.java (94%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{ui/settings => features/settings/ui}/SettingsFragmentPresenter.java (98%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{ui/settings => features/settings/ui}/SettingsFragmentView.java (91%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{ui/settings => features/settings/ui}/SettingsFrameLayout.java (95%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{ui/settings => features/settings/ui}/viewholder/CheckBoxSettingViewHolder.java (80%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{ui/settings => features/settings/ui}/viewholder/HeaderViewHolder.java (74%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{ui/settings => features/settings/ui}/viewholder/InputBindingSettingViewHolder.java (80%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{ui/settings => features/settings/ui}/viewholder/SettingViewHolder.java (84%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{ui/settings => features/settings/ui}/viewholder/SingleChoiceViewHolder.java (74%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{ui/settings => features/settings/ui}/viewholder/SliderViewHolder.java (76%) rename Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/{ui/settings => features/settings/ui}/viewholder/SubmenuViewHolder.java (76%) diff --git a/Source/Android/app/src/main/AndroidManifest.xml b/Source/Android/app/src/main/AndroidManifest.xml index b31ddcfb5d..569c0465fb 100644 --- a/Source/Android/app/src/main/AndroidManifest.xml +++ b/Source/Android/app/src/main/AndroidManifest.xml @@ -54,7 +54,7 @@ diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java index b33919c491..05643bced9 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java @@ -14,8 +14,8 @@ import org.dolphinemu.dolphinemu.R; import org.dolphinemu.dolphinemu.activities.EmulationActivity; import org.dolphinemu.dolphinemu.model.GameFile; import org.dolphinemu.dolphinemu.services.DirectoryInitializationService; -import org.dolphinemu.dolphinemu.ui.settings.MenuTag; -import org.dolphinemu.dolphinemu.ui.settings.SettingsActivity; +import org.dolphinemu.dolphinemu.features.settings.ui.MenuTag; +import org.dolphinemu.dolphinemu.features.settings.ui.SettingsActivity; import org.dolphinemu.dolphinemu.utils.PicassoUtils; import org.dolphinemu.dolphinemu.viewholders.GameViewHolder; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.java index e7c12562cf..75a908dac0 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.java @@ -17,8 +17,8 @@ import org.dolphinemu.dolphinemu.R; import org.dolphinemu.dolphinemu.model.GameFile; import org.dolphinemu.dolphinemu.services.DirectoryInitializationService; import org.dolphinemu.dolphinemu.ui.platform.Platform; -import org.dolphinemu.dolphinemu.ui.settings.MenuTag; -import org.dolphinemu.dolphinemu.ui.settings.SettingsActivity; +import org.dolphinemu.dolphinemu.features.settings.ui.MenuTag; +import org.dolphinemu.dolphinemu.features.settings.ui.SettingsActivity; import org.dolphinemu.dolphinemu.utils.PicassoUtils; import org.dolphinemu.dolphinemu.viewholders.TvGameViewHolder; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java index 31334403a8..cd97b77197 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/MotionAlertDialog.java @@ -8,7 +8,7 @@ import android.view.InputDevice; import android.view.KeyEvent; import android.view.MotionEvent; -import org.dolphinemu.dolphinemu.model.settings.view.InputBindingSetting; +import org.dolphinemu.dolphinemu.features.settings.model.view.InputBindingSetting; import org.dolphinemu.dolphinemu.utils.ControllerMappingHelper; import org.dolphinemu.dolphinemu.utils.Log; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/BooleanSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.java similarity index 87% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/BooleanSetting.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.java index 739a27ae5c..9d814db6c9 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/BooleanSetting.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/BooleanSetting.java @@ -1,4 +1,4 @@ -package org.dolphinemu.dolphinemu.model.settings; +package org.dolphinemu.dolphinemu.features.settings.model; public final class BooleanSetting extends Setting { diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/FloatSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/FloatSetting.java similarity index 87% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/FloatSetting.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/FloatSetting.java index e89d445806..411924b48a 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/FloatSetting.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/FloatSetting.java @@ -1,4 +1,4 @@ -package org.dolphinemu.dolphinemu.model.settings; +package org.dolphinemu.dolphinemu.features.settings.model; public final class FloatSetting extends Setting { diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/IntSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.java similarity index 83% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/IntSetting.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.java index 9f8ae14f95..a9f1c1003d 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/IntSetting.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/IntSetting.java @@ -1,6 +1,6 @@ -package org.dolphinemu.dolphinemu.model.settings; +package org.dolphinemu.dolphinemu.features.settings.model; -import org.dolphinemu.dolphinemu.ui.settings.MenuTag; +import org.dolphinemu.dolphinemu.features.settings.ui.MenuTag; public final class IntSetting extends Setting { diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/Setting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Setting.java similarity index 95% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/Setting.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Setting.java index c670d3b428..b917934820 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/Setting.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/Setting.java @@ -1,4 +1,4 @@ -package org.dolphinemu.dolphinemu.model.settings; +package org.dolphinemu.dolphinemu.features.settings.model; /** * Abstraction for a setting item as read from / written to Dolphin's configuration ini files. diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/SettingSection.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/SettingSection.java similarity index 95% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/SettingSection.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/SettingSection.java index d3bc9863c4..25d07a3dad 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/SettingSection.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/SettingSection.java @@ -1,4 +1,4 @@ -package org.dolphinemu.dolphinemu.model.settings; +package org.dolphinemu.dolphinemu.features.settings.model; import java.util.HashMap; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/StringSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.java similarity index 86% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/StringSetting.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.java index 4ea6af20dd..bbde035132 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/StringSetting.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/StringSetting.java @@ -1,4 +1,4 @@ -package org.dolphinemu.dolphinemu.model.settings; +package org.dolphinemu.dolphinemu.features.settings.model; public final class StringSetting extends Setting { diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/CheckBoxSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/CheckBoxSetting.java similarity index 85% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/CheckBoxSetting.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/CheckBoxSetting.java index bc4fa6b857..0b2be3734f 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/CheckBoxSetting.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/CheckBoxSetting.java @@ -1,7 +1,7 @@ -package org.dolphinemu.dolphinemu.model.settings.view; +package org.dolphinemu.dolphinemu.features.settings.model.view; -import org.dolphinemu.dolphinemu.model.settings.BooleanSetting; -import org.dolphinemu.dolphinemu.model.settings.Setting; +import org.dolphinemu.dolphinemu.features.settings.model.BooleanSetting; +import org.dolphinemu.dolphinemu.features.settings.model.Setting; public final class CheckBoxSetting extends SettingsItem { diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/HeaderSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/HeaderSetting.java similarity index 68% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/HeaderSetting.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/HeaderSetting.java index d4ea39ce1d..ce807edef0 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/HeaderSetting.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/HeaderSetting.java @@ -1,6 +1,6 @@ -package org.dolphinemu.dolphinemu.model.settings.view; +package org.dolphinemu.dolphinemu.features.settings.model.view; -import org.dolphinemu.dolphinemu.model.settings.Setting; +import org.dolphinemu.dolphinemu.features.settings.model.Setting; public final class HeaderSetting extends SettingsItem { diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/InputBindingSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/InputBindingSetting.java similarity index 82% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/InputBindingSetting.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/InputBindingSetting.java index 4537ed2028..95f7be3dec 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/InputBindingSetting.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/InputBindingSetting.java @@ -1,8 +1,7 @@ -package org.dolphinemu.dolphinemu.model.settings.view; +package org.dolphinemu.dolphinemu.features.settings.model.view; -import org.dolphinemu.dolphinemu.model.settings.BooleanSetting; -import org.dolphinemu.dolphinemu.model.settings.Setting; -import org.dolphinemu.dolphinemu.model.settings.StringSetting; +import org.dolphinemu.dolphinemu.features.settings.model.Setting; +import org.dolphinemu.dolphinemu.features.settings.model.StringSetting; public final class InputBindingSetting extends SettingsItem { diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/SettingsItem.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SettingsItem.java similarity index 91% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/SettingsItem.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SettingsItem.java index 95a926038a..3582ef3083 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/SettingsItem.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SettingsItem.java @@ -1,6 +1,7 @@ -package org.dolphinemu.dolphinemu.model.settings.view; +package org.dolphinemu.dolphinemu.features.settings.model.view; -import org.dolphinemu.dolphinemu.model.settings.Setting; +import org.dolphinemu.dolphinemu.features.settings.ui.SettingsAdapter; +import org.dolphinemu.dolphinemu.features.settings.model.Setting; /** * ViewModel abstraction for an Item in the RecyclerView powering SettingsFragments. @@ -110,7 +111,7 @@ public abstract class SettingsItem } /** - * Used by {@link org.dolphinemu.dolphinemu.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) diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/SingleChoiceSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SingleChoiceSetting.java similarity index 87% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/SingleChoiceSetting.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SingleChoiceSetting.java index 68d418f096..5db2a7de87 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/SingleChoiceSetting.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SingleChoiceSetting.java @@ -1,8 +1,8 @@ -package org.dolphinemu.dolphinemu.model.settings.view; +package org.dolphinemu.dolphinemu.features.settings.model.view; -import org.dolphinemu.dolphinemu.model.settings.IntSetting; -import org.dolphinemu.dolphinemu.model.settings.Setting; -import org.dolphinemu.dolphinemu.ui.settings.MenuTag; +import org.dolphinemu.dolphinemu.features.settings.model.IntSetting; +import org.dolphinemu.dolphinemu.features.settings.model.Setting; +import org.dolphinemu.dolphinemu.features.settings.ui.MenuTag; public final class SingleChoiceSetting extends SettingsItem { diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/SliderSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SliderSetting.java similarity index 90% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/SliderSetting.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SliderSetting.java index 9ab9edf4a9..76b193f484 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/SliderSetting.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SliderSetting.java @@ -1,8 +1,8 @@ -package org.dolphinemu.dolphinemu.model.settings.view; +package org.dolphinemu.dolphinemu.features.settings.model.view; -import org.dolphinemu.dolphinemu.model.settings.FloatSetting; -import org.dolphinemu.dolphinemu.model.settings.IntSetting; -import org.dolphinemu.dolphinemu.model.settings.Setting; +import org.dolphinemu.dolphinemu.features.settings.model.FloatSetting; +import org.dolphinemu.dolphinemu.features.settings.model.IntSetting; +import org.dolphinemu.dolphinemu.features.settings.model.Setting; import org.dolphinemu.dolphinemu.utils.Log; import org.dolphinemu.dolphinemu.utils.SettingsFile; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/StringSingleChoiceSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/StringSingleChoiceSetting.java similarity index 91% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/StringSingleChoiceSetting.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/StringSingleChoiceSetting.java index 161ee0f567..ed44e439a7 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/StringSingleChoiceSetting.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/StringSingleChoiceSetting.java @@ -1,7 +1,7 @@ -package org.dolphinemu.dolphinemu.model.settings.view; +package org.dolphinemu.dolphinemu.features.settings.model.view; -import org.dolphinemu.dolphinemu.model.settings.Setting; -import org.dolphinemu.dolphinemu.model.settings.StringSetting; +import org.dolphinemu.dolphinemu.features.settings.model.Setting; +import org.dolphinemu.dolphinemu.features.settings.model.StringSetting; public class StringSingleChoiceSetting extends SettingsItem { diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/SubmenuSetting.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SubmenuSetting.java similarity index 67% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/SubmenuSetting.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SubmenuSetting.java index 1c528ed356..3816aa7bf5 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/settings/view/SubmenuSetting.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/model/view/SubmenuSetting.java @@ -1,7 +1,7 @@ -package org.dolphinemu.dolphinemu.model.settings.view; +package org.dolphinemu.dolphinemu.features.settings.model.view; -import org.dolphinemu.dolphinemu.model.settings.Setting; -import org.dolphinemu.dolphinemu.ui.settings.MenuTag; +import org.dolphinemu.dolphinemu.features.settings.model.Setting; +import org.dolphinemu.dolphinemu.features.settings.ui.MenuTag; public final class SubmenuSetting extends SettingsItem { diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/MenuTag.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/MenuTag.java similarity index 97% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/MenuTag.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/MenuTag.java index 00582c34f7..3a9c1e9e69 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/MenuTag.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/MenuTag.java @@ -1,4 +1,4 @@ -package org.dolphinemu.dolphinemu.ui.settings; +package org.dolphinemu.dolphinemu.features.settings.ui; public enum MenuTag { diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java similarity index 97% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java index 1c76b48042..99c33b8dcd 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivity.java @@ -1,4 +1,4 @@ -package org.dolphinemu.dolphinemu.ui.settings; +package org.dolphinemu.dolphinemu.features.settings.ui; import android.app.ProgressDialog; import android.content.Context; @@ -15,10 +15,9 @@ import android.view.MenuItem; import android.widget.Toast; import org.dolphinemu.dolphinemu.R; -import org.dolphinemu.dolphinemu.model.settings.SettingSection; +import org.dolphinemu.dolphinemu.features.settings.model.SettingSection; import org.dolphinemu.dolphinemu.services.DirectoryInitializationService; import org.dolphinemu.dolphinemu.utils.DirectoryStateReceiver; -import org.dolphinemu.dolphinemu.utils.Log; import java.util.ArrayList; import java.util.HashMap; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java similarity index 97% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityPresenter.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java index b63481794f..908e49887a 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityPresenter.java @@ -1,11 +1,11 @@ -package org.dolphinemu.dolphinemu.ui.settings; +package org.dolphinemu.dolphinemu.features.settings.ui; import android.content.IntentFilter; import android.os.Bundle; import android.text.TextUtils; import org.dolphinemu.dolphinemu.R; -import org.dolphinemu.dolphinemu.model.settings.SettingSection; +import org.dolphinemu.dolphinemu.features.settings.model.SettingSection; import org.dolphinemu.dolphinemu.services.DirectoryInitializationService; import org.dolphinemu.dolphinemu.services.DirectoryInitializationService.DirectoryInitializationState; import org.dolphinemu.dolphinemu.utils.DirectoryStateReceiver; @@ -15,8 +15,6 @@ import org.dolphinemu.dolphinemu.utils.SettingsFile; import java.util.ArrayList; import java.util.HashMap; -import rx.functions.Action1; - public final class SettingsActivityPresenter { private static final String KEY_SHOULD_SAVE = "should_save"; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityView.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityView.java similarity index 96% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityView.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityView.java index 5885868531..881a58002d 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityView.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsActivityView.java @@ -1,9 +1,9 @@ -package org.dolphinemu.dolphinemu.ui.settings; +package org.dolphinemu.dolphinemu.features.settings.ui; import android.content.IntentFilter; import android.os.Bundle; -import org.dolphinemu.dolphinemu.model.settings.SettingSection; +import org.dolphinemu.dolphinemu.features.settings.model.SettingSection; import org.dolphinemu.dolphinemu.utils.DirectoryStateReceiver; import java.util.ArrayList; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsAdapter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java similarity index 88% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsAdapter.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java index 2f58e2801f..47e792ce79 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsAdapter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsAdapter.java @@ -1,4 +1,4 @@ -package org.dolphinemu.dolphinemu.ui.settings; +package org.dolphinemu.dolphinemu.features.settings.ui; import android.content.Context; import android.content.DialogInterface; @@ -14,24 +14,24 @@ import android.widget.TextView; import org.dolphinemu.dolphinemu.R; import org.dolphinemu.dolphinemu.dialogs.MotionAlertDialog; -import org.dolphinemu.dolphinemu.model.settings.BooleanSetting; -import org.dolphinemu.dolphinemu.model.settings.FloatSetting; -import org.dolphinemu.dolphinemu.model.settings.IntSetting; -import org.dolphinemu.dolphinemu.model.settings.StringSetting; -import org.dolphinemu.dolphinemu.model.settings.view.CheckBoxSetting; -import org.dolphinemu.dolphinemu.model.settings.view.InputBindingSetting; -import org.dolphinemu.dolphinemu.model.settings.view.SettingsItem; -import org.dolphinemu.dolphinemu.model.settings.view.SingleChoiceSetting; -import org.dolphinemu.dolphinemu.model.settings.view.SliderSetting; -import org.dolphinemu.dolphinemu.model.settings.view.StringSingleChoiceSetting; -import org.dolphinemu.dolphinemu.model.settings.view.SubmenuSetting; -import org.dolphinemu.dolphinemu.ui.settings.viewholder.CheckBoxSettingViewHolder; -import org.dolphinemu.dolphinemu.ui.settings.viewholder.HeaderViewHolder; -import org.dolphinemu.dolphinemu.ui.settings.viewholder.InputBindingSettingViewHolder; -import org.dolphinemu.dolphinemu.ui.settings.viewholder.SettingViewHolder; -import org.dolphinemu.dolphinemu.ui.settings.viewholder.SingleChoiceViewHolder; -import org.dolphinemu.dolphinemu.ui.settings.viewholder.SliderViewHolder; -import org.dolphinemu.dolphinemu.ui.settings.viewholder.SubmenuViewHolder; +import org.dolphinemu.dolphinemu.features.settings.model.BooleanSetting; +import org.dolphinemu.dolphinemu.features.settings.model.FloatSetting; +import org.dolphinemu.dolphinemu.features.settings.model.IntSetting; +import org.dolphinemu.dolphinemu.features.settings.model.StringSetting; +import org.dolphinemu.dolphinemu.features.settings.model.view.CheckBoxSetting; +import org.dolphinemu.dolphinemu.features.settings.model.view.InputBindingSetting; +import org.dolphinemu.dolphinemu.features.settings.model.view.SettingsItem; +import org.dolphinemu.dolphinemu.features.settings.model.view.SingleChoiceSetting; +import org.dolphinemu.dolphinemu.features.settings.model.view.SliderSetting; +import org.dolphinemu.dolphinemu.features.settings.model.view.StringSingleChoiceSetting; +import org.dolphinemu.dolphinemu.features.settings.model.view.SubmenuSetting; +import org.dolphinemu.dolphinemu.features.settings.ui.viewholder.CheckBoxSettingViewHolder; +import org.dolphinemu.dolphinemu.features.settings.ui.viewholder.HeaderViewHolder; +import org.dolphinemu.dolphinemu.features.settings.ui.viewholder.InputBindingSettingViewHolder; +import org.dolphinemu.dolphinemu.features.settings.ui.viewholder.SettingViewHolder; +import org.dolphinemu.dolphinemu.features.settings.ui.viewholder.SingleChoiceViewHolder; +import org.dolphinemu.dolphinemu.features.settings.ui.viewholder.SliderViewHolder; +import org.dolphinemu.dolphinemu.features.settings.ui.viewholder.SubmenuViewHolder; import org.dolphinemu.dolphinemu.utils.Log; import org.dolphinemu.dolphinemu.utils.SettingsFile; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragment.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java similarity index 94% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragment.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java index ccd2f1e7b1..c1e95fc218 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragment.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragment.java @@ -1,4 +1,4 @@ -package org.dolphinemu.dolphinemu.ui.settings; +package org.dolphinemu.dolphinemu.features.settings.ui; import android.app.Activity; import android.content.Context; @@ -12,9 +12,9 @@ import android.view.View; import android.view.ViewGroup; import org.dolphinemu.dolphinemu.R; -import org.dolphinemu.dolphinemu.model.settings.Setting; -import org.dolphinemu.dolphinemu.model.settings.SettingSection; -import org.dolphinemu.dolphinemu.model.settings.view.SettingsItem; +import org.dolphinemu.dolphinemu.features.settings.model.Setting; +import org.dolphinemu.dolphinemu.features.settings.model.SettingSection; +import org.dolphinemu.dolphinemu.features.settings.model.view.SettingsItem; import org.dolphinemu.dolphinemu.ui.DividerItemDecoration; import org.dolphinemu.dolphinemu.utils.SettingsFile; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java similarity index 98% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java index 03464c2e5e..883547dd7f 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentPresenter.java @@ -1,4 +1,4 @@ -package org.dolphinemu.dolphinemu.ui.settings; +package org.dolphinemu.dolphinemu.features.settings.ui; import android.text.TextUtils; @@ -6,19 +6,19 @@ import android.os.Bundle; import org.dolphinemu.dolphinemu.NativeLibrary; import org.dolphinemu.dolphinemu.R; -import org.dolphinemu.dolphinemu.model.settings.BooleanSetting; -import org.dolphinemu.dolphinemu.model.settings.IntSetting; -import org.dolphinemu.dolphinemu.model.settings.Setting; -import org.dolphinemu.dolphinemu.model.settings.SettingSection; -import org.dolphinemu.dolphinemu.model.settings.StringSetting; -import org.dolphinemu.dolphinemu.model.settings.view.CheckBoxSetting; -import org.dolphinemu.dolphinemu.model.settings.view.HeaderSetting; -import org.dolphinemu.dolphinemu.model.settings.view.InputBindingSetting; -import org.dolphinemu.dolphinemu.model.settings.view.SettingsItem; -import org.dolphinemu.dolphinemu.model.settings.view.SingleChoiceSetting; -import org.dolphinemu.dolphinemu.model.settings.view.SliderSetting; -import org.dolphinemu.dolphinemu.model.settings.view.StringSingleChoiceSetting; -import org.dolphinemu.dolphinemu.model.settings.view.SubmenuSetting; +import org.dolphinemu.dolphinemu.features.settings.model.BooleanSetting; +import org.dolphinemu.dolphinemu.features.settings.model.IntSetting; +import org.dolphinemu.dolphinemu.features.settings.model.Setting; +import org.dolphinemu.dolphinemu.features.settings.model.SettingSection; +import org.dolphinemu.dolphinemu.features.settings.model.StringSetting; +import org.dolphinemu.dolphinemu.features.settings.model.view.CheckBoxSetting; +import org.dolphinemu.dolphinemu.features.settings.model.view.HeaderSetting; +import org.dolphinemu.dolphinemu.features.settings.model.view.InputBindingSetting; +import org.dolphinemu.dolphinemu.features.settings.model.view.SettingsItem; +import org.dolphinemu.dolphinemu.features.settings.model.view.SingleChoiceSetting; +import org.dolphinemu.dolphinemu.features.settings.model.view.SliderSetting; +import org.dolphinemu.dolphinemu.features.settings.model.view.StringSingleChoiceSetting; +import org.dolphinemu.dolphinemu.features.settings.model.view.SubmenuSetting; import org.dolphinemu.dolphinemu.services.DirectoryInitializationService; import org.dolphinemu.dolphinemu.utils.EGLHelper; import org.dolphinemu.dolphinemu.utils.Log; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentView.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentView.java similarity index 91% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentView.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentView.java index 81c839037c..d533cac1a0 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentView.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFragmentView.java @@ -1,10 +1,10 @@ -package org.dolphinemu.dolphinemu.ui.settings; +package org.dolphinemu.dolphinemu.features.settings.ui; import android.support.v4.app.FragmentActivity; -import org.dolphinemu.dolphinemu.model.settings.Setting; -import org.dolphinemu.dolphinemu.model.settings.SettingSection; -import org.dolphinemu.dolphinemu.model.settings.view.SettingsItem; +import org.dolphinemu.dolphinemu.features.settings.model.Setting; +import org.dolphinemu.dolphinemu.features.settings.model.SettingSection; +import org.dolphinemu.dolphinemu.features.settings.model.view.SettingsItem; import java.util.ArrayList; import java.util.HashMap; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFrameLayout.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFrameLayout.java similarity index 95% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFrameLayout.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFrameLayout.java index fc3d46e01d..793878577a 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFrameLayout.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/SettingsFrameLayout.java @@ -1,4 +1,4 @@ -package org.dolphinemu.dolphinemu.ui.settings; +package org.dolphinemu.dolphinemu.features.settings.ui; import android.content.Context; import android.util.AttributeSet; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/CheckBoxSettingViewHolder.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/CheckBoxSettingViewHolder.java similarity index 80% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/CheckBoxSettingViewHolder.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/CheckBoxSettingViewHolder.java index 13a7524385..db31da7e8d 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/CheckBoxSettingViewHolder.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/CheckBoxSettingViewHolder.java @@ -1,13 +1,13 @@ -package org.dolphinemu.dolphinemu.ui.settings.viewholder; +package org.dolphinemu.dolphinemu.features.settings.ui.viewholder; import android.view.View; import android.widget.CheckBox; import android.widget.TextView; import org.dolphinemu.dolphinemu.R; -import org.dolphinemu.dolphinemu.model.settings.view.CheckBoxSetting; -import org.dolphinemu.dolphinemu.model.settings.view.SettingsItem; -import org.dolphinemu.dolphinemu.ui.settings.SettingsAdapter; +import org.dolphinemu.dolphinemu.features.settings.model.view.CheckBoxSetting; +import org.dolphinemu.dolphinemu.features.settings.model.view.SettingsItem; +import org.dolphinemu.dolphinemu.features.settings.ui.SettingsAdapter; public final class CheckBoxSettingViewHolder extends SettingViewHolder { diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/HeaderViewHolder.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/HeaderViewHolder.java similarity index 74% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/HeaderViewHolder.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/HeaderViewHolder.java index 6e3b53d4b3..ab0d3259b9 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/HeaderViewHolder.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/HeaderViewHolder.java @@ -1,11 +1,11 @@ -package org.dolphinemu.dolphinemu.ui.settings.viewholder; +package org.dolphinemu.dolphinemu.features.settings.ui.viewholder; import android.view.View; import android.widget.TextView; import org.dolphinemu.dolphinemu.R; -import org.dolphinemu.dolphinemu.model.settings.view.SettingsItem; -import org.dolphinemu.dolphinemu.ui.settings.SettingsAdapter; +import org.dolphinemu.dolphinemu.features.settings.model.view.SettingsItem; +import org.dolphinemu.dolphinemu.features.settings.ui.SettingsAdapter; public final class HeaderViewHolder extends SettingViewHolder { diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/InputBindingSettingViewHolder.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/InputBindingSettingViewHolder.java similarity index 80% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/InputBindingSettingViewHolder.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/InputBindingSettingViewHolder.java index d3df136ca9..eb03ac9c0d 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/InputBindingSettingViewHolder.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/InputBindingSettingViewHolder.java @@ -1,4 +1,4 @@ -package org.dolphinemu.dolphinemu.ui.settings.viewholder; +package org.dolphinemu.dolphinemu.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.dolphinemu.dolphinemu.R; -import org.dolphinemu.dolphinemu.model.settings.view.InputBindingSetting; -import org.dolphinemu.dolphinemu.model.settings.view.SettingsItem; -import org.dolphinemu.dolphinemu.ui.settings.SettingsAdapter; +import org.dolphinemu.dolphinemu.features.settings.model.view.InputBindingSetting; +import org.dolphinemu.dolphinemu.features.settings.model.view.SettingsItem; +import org.dolphinemu.dolphinemu.features.settings.ui.SettingsAdapter; public final class InputBindingSettingViewHolder extends SettingViewHolder { diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/SettingViewHolder.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SettingViewHolder.java similarity index 84% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/SettingViewHolder.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SettingViewHolder.java index f57e9fc82c..6af5f1d014 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/SettingViewHolder.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SettingViewHolder.java @@ -1,10 +1,10 @@ -package org.dolphinemu.dolphinemu.ui.settings.viewholder; +package org.dolphinemu.dolphinemu.features.settings.ui.viewholder; import android.support.v7.widget.RecyclerView; import android.view.View; -import org.dolphinemu.dolphinemu.model.settings.view.SettingsItem; -import org.dolphinemu.dolphinemu.ui.settings.SettingsAdapter; +import org.dolphinemu.dolphinemu.features.settings.model.view.SettingsItem; +import org.dolphinemu.dolphinemu.features.settings.ui.SettingsAdapter; public abstract class SettingViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener { diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/SingleChoiceViewHolder.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SingleChoiceViewHolder.java similarity index 74% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/SingleChoiceViewHolder.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SingleChoiceViewHolder.java index c44d64b79b..cf4f4538f9 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/SingleChoiceViewHolder.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SingleChoiceViewHolder.java @@ -1,13 +1,13 @@ -package org.dolphinemu.dolphinemu.ui.settings.viewholder; +package org.dolphinemu.dolphinemu.features.settings.ui.viewholder; import android.view.View; import android.widget.TextView; import org.dolphinemu.dolphinemu.R; -import org.dolphinemu.dolphinemu.model.settings.view.SettingsItem; -import org.dolphinemu.dolphinemu.model.settings.view.SingleChoiceSetting; -import org.dolphinemu.dolphinemu.model.settings.view.StringSingleChoiceSetting; -import org.dolphinemu.dolphinemu.ui.settings.SettingsAdapter; +import org.dolphinemu.dolphinemu.features.settings.model.view.SettingsItem; +import org.dolphinemu.dolphinemu.features.settings.model.view.SingleChoiceSetting; +import org.dolphinemu.dolphinemu.features.settings.model.view.StringSingleChoiceSetting; +import org.dolphinemu.dolphinemu.features.settings.ui.SettingsAdapter; public final class SingleChoiceViewHolder extends SettingViewHolder { diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/SliderViewHolder.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SliderViewHolder.java similarity index 76% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/SliderViewHolder.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SliderViewHolder.java index e44aadbde0..6cfe1563db 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/SliderViewHolder.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SliderViewHolder.java @@ -1,12 +1,12 @@ -package org.dolphinemu.dolphinemu.ui.settings.viewholder; +package org.dolphinemu.dolphinemu.features.settings.ui.viewholder; import android.view.View; import android.widget.TextView; import org.dolphinemu.dolphinemu.R; -import org.dolphinemu.dolphinemu.model.settings.view.SettingsItem; -import org.dolphinemu.dolphinemu.model.settings.view.SliderSetting; -import org.dolphinemu.dolphinemu.ui.settings.SettingsAdapter; +import org.dolphinemu.dolphinemu.features.settings.model.view.SettingsItem; +import org.dolphinemu.dolphinemu.features.settings.model.view.SliderSetting; +import org.dolphinemu.dolphinemu.features.settings.ui.SettingsAdapter; public final class SliderViewHolder extends SettingViewHolder { diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/SubmenuViewHolder.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SubmenuViewHolder.java similarity index 76% rename from Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/SubmenuViewHolder.java rename to Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SubmenuViewHolder.java index 4a8243cec7..ac929ee503 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/viewholder/SubmenuViewHolder.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/features/settings/ui/viewholder/SubmenuViewHolder.java @@ -1,12 +1,12 @@ -package org.dolphinemu.dolphinemu.ui.settings.viewholder; +package org.dolphinemu.dolphinemu.features.settings.ui.viewholder; import android.view.View; import android.widget.TextView; import org.dolphinemu.dolphinemu.R; -import org.dolphinemu.dolphinemu.model.settings.view.SettingsItem; -import org.dolphinemu.dolphinemu.model.settings.view.SubmenuSetting; -import org.dolphinemu.dolphinemu.ui.settings.SettingsAdapter; +import org.dolphinemu.dolphinemu.features.settings.model.view.SettingsItem; +import org.dolphinemu.dolphinemu.features.settings.model.view.SubmenuSetting; +import org.dolphinemu.dolphinemu.features.settings.ui.SettingsAdapter; public final class SubmenuViewHolder extends SettingViewHolder { diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java index 36ea898753..a2d47444af 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainActivity.java @@ -21,8 +21,8 @@ import org.dolphinemu.dolphinemu.services.DirectoryInitializationService; import org.dolphinemu.dolphinemu.services.GameFileCacheService; import org.dolphinemu.dolphinemu.ui.platform.Platform; import org.dolphinemu.dolphinemu.ui.platform.PlatformGamesView; -import org.dolphinemu.dolphinemu.ui.settings.MenuTag; -import org.dolphinemu.dolphinemu.ui.settings.SettingsActivity; +import org.dolphinemu.dolphinemu.features.settings.ui.MenuTag; +import org.dolphinemu.dolphinemu.features.settings.ui.SettingsActivity; import org.dolphinemu.dolphinemu.utils.FileBrowserHelper; import org.dolphinemu.dolphinemu.utils.PermissionsHandler; import org.dolphinemu.dolphinemu.utils.StartupHandler; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java index 92e35e5907..08a09c200f 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainPresenter.java @@ -10,7 +10,7 @@ import org.dolphinemu.dolphinemu.BuildConfig; import org.dolphinemu.dolphinemu.R; import org.dolphinemu.dolphinemu.model.GameFileCache; import org.dolphinemu.dolphinemu.services.GameFileCacheService; -import org.dolphinemu.dolphinemu.ui.settings.MenuTag; +import org.dolphinemu.dolphinemu.features.settings.ui.MenuTag; public final class MainPresenter { diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainView.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainView.java index 88e6a175c3..6f5bd17335 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainView.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/MainView.java @@ -1,6 +1,6 @@ package org.dolphinemu.dolphinemu.ui.main; -import org.dolphinemu.dolphinemu.ui.settings.MenuTag; +import org.dolphinemu.dolphinemu.features.settings.ui.MenuTag; /** * Abstraction for the screen that shows on application launch. diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java index 4ab556f647..feb8827eef 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/main/TvMainActivity.java @@ -24,8 +24,8 @@ import org.dolphinemu.dolphinemu.model.TvSettingsItem; import org.dolphinemu.dolphinemu.services.DirectoryInitializationService; import org.dolphinemu.dolphinemu.services.GameFileCacheService; import org.dolphinemu.dolphinemu.ui.platform.Platform; -import org.dolphinemu.dolphinemu.ui.settings.MenuTag; -import org.dolphinemu.dolphinemu.ui.settings.SettingsActivity; +import org.dolphinemu.dolphinemu.features.settings.ui.MenuTag; +import org.dolphinemu.dolphinemu.features.settings.ui.SettingsActivity; import org.dolphinemu.dolphinemu.utils.FileBrowserHelper; import org.dolphinemu.dolphinemu.utils.PermissionsHandler; import org.dolphinemu.dolphinemu.utils.StartupHandler; diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java index 1e2084dd57..afb9eb772b 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/SettingsFile.java @@ -2,14 +2,14 @@ package org.dolphinemu.dolphinemu.utils; import android.support.annotation.NonNull; -import org.dolphinemu.dolphinemu.model.settings.BooleanSetting; -import org.dolphinemu.dolphinemu.model.settings.FloatSetting; -import org.dolphinemu.dolphinemu.model.settings.IntSetting; -import org.dolphinemu.dolphinemu.model.settings.Setting; -import org.dolphinemu.dolphinemu.model.settings.SettingSection; -import org.dolphinemu.dolphinemu.model.settings.StringSetting; +import org.dolphinemu.dolphinemu.features.settings.model.BooleanSetting; +import org.dolphinemu.dolphinemu.features.settings.model.FloatSetting; +import org.dolphinemu.dolphinemu.features.settings.model.IntSetting; +import org.dolphinemu.dolphinemu.features.settings.model.Setting; +import org.dolphinemu.dolphinemu.features.settings.model.SettingSection; +import org.dolphinemu.dolphinemu.features.settings.model.StringSetting; import org.dolphinemu.dolphinemu.services.DirectoryInitializationService; -import org.dolphinemu.dolphinemu.ui.settings.SettingsActivityView; +import org.dolphinemu.dolphinemu.features.settings.ui.SettingsActivityView; import java.io.BufferedReader; import java.io.File; diff --git a/Source/Android/app/src/main/res/layout/fragment_settings.xml b/Source/Android/app/src/main/res/layout/fragment_settings.xml index 9295228853..36b41502dc 100644 --- a/Source/Android/app/src/main/res/layout/fragment_settings.xml +++ b/Source/Android/app/src/main/res/layout/fragment_settings.xml @@ -1,7 +1,7 @@ - + - \ No newline at end of file + \ No newline at end of file