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

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

Source/Android/app/src/main/AndroidManifest.xml

@@ -54,7 +54,7 @@
         </activity>
 
         <activity
-            android:name=".ui.settings.SettingsActivity"
+            android:name=".features.settings.ui.SettingsActivity"
             android:theme="@style/DolphinSettingsGamecube"
             android:label="@string/preferences_settings"/>
 

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;
 

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;
 

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;
 

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
 {

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
 {

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
 {

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.

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;
 

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
 {

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
 {

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
 {

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
 {

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)

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
 {

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;
 

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
 {

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
 {

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
 {

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;