From d78319ee00fe07569883ef768c79da8778465545 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Sun, 3 Aug 2014 23:08:56 +0200
Subject: [PATCH] Move Activities and Fragments into seperate folders.

---
 src/main/AndroidManifest.xml                             | 8 ++++----
 .../{gui => activities}/FolderPickerActivity.java        | 2 +-
 .../{gui => activities}/MainActivity.java                | 9 ++++++---
 .../{gui => activities}/SettingsActivity.java            | 9 ++++++---
 .../{gui => activities}/WebGuiActivity.java              | 2 +-
 .../{gui => fragments}/LocalNodeInfoFragment.java        | 3 ++-
 .../{gui => fragments}/NodeSettingsFragment.java         | 3 ++-
 .../{gui => fragments}/NodesFragment.java                | 4 +++-
 .../{gui => fragments}/RepoSettingsFragment.java         | 9 ++++-----
 .../{gui => fragments}/ReposFragment.java                | 4 +++-
 .../{gui => fragments}/SettingsFragment.java             | 3 +--
 .../syncthingandroid/syncthing/SyncthingService.java     | 5 ++---
 12 files changed, 35 insertions(+), 26 deletions(-)
 rename src/main/java/com/nutomic/syncthingandroid/{gui => activities}/FolderPickerActivity.java (99%)
 rename src/main/java/com/nutomic/syncthingandroid/{gui => activities}/MainActivity.java (95%)
 rename src/main/java/com/nutomic/syncthingandroid/{gui => activities}/SettingsActivity.java (83%)
 rename src/main/java/com/nutomic/syncthingandroid/{gui => activities}/WebGuiActivity.java (98%)
 rename src/main/java/com/nutomic/syncthingandroid/{gui => fragments}/LocalNodeInfoFragment.java (97%)
 rename src/main/java/com/nutomic/syncthingandroid/{gui => fragments}/NodeSettingsFragment.java (98%)
 rename src/main/java/com/nutomic/syncthingandroid/{gui => fragments}/NodesFragment.java (93%)
 rename src/main/java/com/nutomic/syncthingandroid/{gui => fragments}/RepoSettingsFragment.java (96%)
 rename src/main/java/com/nutomic/syncthingandroid/{gui => fragments}/ReposFragment.java (93%)
 rename src/main/java/com/nutomic/syncthingandroid/{gui => fragments}/SettingsFragment.java (98%)

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 478a0b5d..a7e60935 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -22,7 +22,7 @@
 			android:label="@string/app_name"
 			android:theme="@style/AppTheme" >
 		<activity
-				android:name=".gui.MainActivity"
+				android:name=".activities.MainActivity"
 				android:label="@string/app_name"
 				android:launchMode="singleTop" >
 			<intent-filter>
@@ -32,14 +32,14 @@
 			</intent-filter>
 		</activity>
 		<activity
-				android:name=".gui.WebGuiActivity"
+				android:name=".activities.WebGuiActivity"
 				android:label="@string/web_gui_title" >
 			<meta-data
 					android:name="android.support.PARENT_ACTIVITY"
 					android:value=".gui.MainActivity" />
 		</activity>
 		<activity
-				android:name=".gui.SettingsActivity" >
+				android:name=".activities.SettingsActivity" >
 			<meta-data
 					android:name="android.support.PARENT_ACTIVITY"
 					android:value=".gui.MainActivity" />
@@ -48,7 +48,7 @@
 		<service android:name=".syncthing.SyncthingService" />
 
 		<activity
-				android:name=".gui.FolderPickerActivity"
+				android:name=".activities.FolderPickerActivity"
 				android:label="@string/folder_picker_title" >
 			<meta-data
 					android:name="android.support.UI_OPTIONS"
diff --git a/src/main/java/com/nutomic/syncthingandroid/gui/FolderPickerActivity.java b/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java
similarity index 99%
rename from src/main/java/com/nutomic/syncthingandroid/gui/FolderPickerActivity.java
rename to src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java
index 2699eb85..70e026a4 100644
--- a/src/main/java/com/nutomic/syncthingandroid/gui/FolderPickerActivity.java
+++ b/src/main/java/com/nutomic/syncthingandroid/activities/FolderPickerActivity.java
@@ -1,4 +1,4 @@
-package com.nutomic.syncthingandroid.gui;
+package com.nutomic.syncthingandroid.activities;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/src/main/java/com/nutomic/syncthingandroid/gui/MainActivity.java b/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java
similarity index 95%
rename from src/main/java/com/nutomic/syncthingandroid/gui/MainActivity.java
rename to src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java
index 60b68c03..00541417 100644
--- a/src/main/java/com/nutomic/syncthingandroid/gui/MainActivity.java
+++ b/src/main/java/com/nutomic/syncthingandroid/activities/MainActivity.java
@@ -1,4 +1,4 @@
-package com.nutomic.syncthingandroid.gui;
+package com.nutomic.syncthingandroid.activities;
 
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
@@ -30,13 +30,16 @@ import android.view.View;
 import android.widget.TextView;
 
 import com.nutomic.syncthingandroid.R;
+import com.nutomic.syncthingandroid.fragments.LocalNodeInfoFragment;
+import com.nutomic.syncthingandroid.fragments.NodesFragment;
+import com.nutomic.syncthingandroid.fragments.ReposFragment;
 import com.nutomic.syncthingandroid.syncthing.RestApi;
 import com.nutomic.syncthingandroid.syncthing.SyncthingService;
 import com.nutomic.syncthingandroid.syncthing.SyncthingServiceBinder;
 
 /**
- * Shows {@link ReposFragment} and {@link NodesFragment} in different tabs, and
- * {@link LocalNodeInfoFragment} in the navigation drawer.
+ * Shows {@link com.nutomic.syncthingandroid.fragments.ReposFragment} and {@link com.nutomic.syncthingandroid.fragments.NodesFragment} in different tabs, and
+ * {@link com.nutomic.syncthingandroid.fragments.LocalNodeInfoFragment} in the navigation drawer.
  */
 public class MainActivity extends ActionBarActivity
 		implements SyncthingService.OnApiChangeListener {
diff --git a/src/main/java/com/nutomic/syncthingandroid/gui/SettingsActivity.java b/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java
similarity index 83%
rename from src/main/java/com/nutomic/syncthingandroid/gui/SettingsActivity.java
rename to src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java
index 5e471f0f..350bf939 100644
--- a/src/main/java/com/nutomic/syncthingandroid/gui/SettingsActivity.java
+++ b/src/main/java/com/nutomic/syncthingandroid/activities/SettingsActivity.java
@@ -1,4 +1,4 @@
-package com.nutomic.syncthingandroid.gui;
+package com.nutomic.syncthingandroid.activities;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -6,6 +6,9 @@ import android.support.v4.app.FragmentManager;
 import android.support.v7.app.ActionBarActivity;
 
 import com.nutomic.syncthingandroid.R;
+import com.nutomic.syncthingandroid.fragments.NodeSettingsFragment;
+import com.nutomic.syncthingandroid.fragments.RepoSettingsFragment;
+import com.nutomic.syncthingandroid.fragments.SettingsFragment;
 
 /**
  * General Activity used by all PreferenceFragments.
@@ -23,8 +26,8 @@ public class SettingsActivity extends ActionBarActivity {
 	 * {@link #ACTION_REPO_SETTINGS_FRAGMENT} to determine if an existing repo/node should be
 	 * edited or a new one created.
 	 *
-	 * If this is false, {@link RepoSettingsFragment#EXTRA_REPO_ID} or
-	 * {@link NodeSettingsFragment#EXTRA_NODE_ID} must be set (according to the selected fragment).
+	 * If this is false, {@link com.nutomic.syncthingandroid.fragments.RepoSettingsFragment#EXTRA_REPO_ID} or
+	 * {@link com.nutomic.syncthingandroid.fragments.NodeSettingsFragment#EXTRA_NODE_ID} must be set (according to the selected fragment).
 	 */
 	public static final String EXTRA_IS_CREATE = "create";
 
diff --git a/src/main/java/com/nutomic/syncthingandroid/gui/WebGuiActivity.java b/src/main/java/com/nutomic/syncthingandroid/activities/WebGuiActivity.java
similarity index 98%
rename from src/main/java/com/nutomic/syncthingandroid/gui/WebGuiActivity.java
rename to src/main/java/com/nutomic/syncthingandroid/activities/WebGuiActivity.java
index cbeeb872..c16e91c5 100644
--- a/src/main/java/com/nutomic/syncthingandroid/gui/WebGuiActivity.java
+++ b/src/main/java/com/nutomic/syncthingandroid/activities/WebGuiActivity.java
@@ -1,4 +1,4 @@
-package com.nutomic.syncthingandroid.gui;
+package com.nutomic.syncthingandroid.activities;
 
 import android.annotation.SuppressLint;
 import android.content.ComponentName;
diff --git a/src/main/java/com/nutomic/syncthingandroid/gui/LocalNodeInfoFragment.java b/src/main/java/com/nutomic/syncthingandroid/fragments/LocalNodeInfoFragment.java
similarity index 97%
rename from src/main/java/com/nutomic/syncthingandroid/gui/LocalNodeInfoFragment.java
rename to src/main/java/com/nutomic/syncthingandroid/fragments/LocalNodeInfoFragment.java
index 4b90e443..be866cbc 100644
--- a/src/main/java/com/nutomic/syncthingandroid/gui/LocalNodeInfoFragment.java
+++ b/src/main/java/com/nutomic/syncthingandroid/fragments/LocalNodeInfoFragment.java
@@ -1,4 +1,4 @@
-package com.nutomic.syncthingandroid.gui;
+package com.nutomic.syncthingandroid.fragments;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -13,6 +13,7 @@ import android.view.ViewGroup;
 import android.widget.TextView;
 
 import com.nutomic.syncthingandroid.R;
+import com.nutomic.syncthingandroid.activities.MainActivity;
 import com.nutomic.syncthingandroid.syncthing.RestApi;
 import com.nutomic.syncthingandroid.syncthing.SyncthingService;
 
diff --git a/src/main/java/com/nutomic/syncthingandroid/gui/NodeSettingsFragment.java b/src/main/java/com/nutomic/syncthingandroid/fragments/NodeSettingsFragment.java
similarity index 98%
rename from src/main/java/com/nutomic/syncthingandroid/gui/NodeSettingsFragment.java
rename to src/main/java/com/nutomic/syncthingandroid/fragments/NodeSettingsFragment.java
index f41a1df3..c8d0b684 100644
--- a/src/main/java/com/nutomic/syncthingandroid/gui/NodeSettingsFragment.java
+++ b/src/main/java/com/nutomic/syncthingandroid/fragments/NodeSettingsFragment.java
@@ -1,4 +1,4 @@
-package com.nutomic.syncthingandroid.gui;
+package com.nutomic.syncthingandroid.fragments;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -21,6 +21,7 @@ import android.view.View;
 import android.widget.Toast;
 
 import com.nutomic.syncthingandroid.R;
+import com.nutomic.syncthingandroid.activities.SettingsActivity;
 import com.nutomic.syncthingandroid.syncthing.RestApi;
 import com.nutomic.syncthingandroid.syncthing.SyncthingService;
 import com.nutomic.syncthingandroid.syncthing.SyncthingServiceBinder;
diff --git a/src/main/java/com/nutomic/syncthingandroid/gui/NodesFragment.java b/src/main/java/com/nutomic/syncthingandroid/fragments/NodesFragment.java
similarity index 93%
rename from src/main/java/com/nutomic/syncthingandroid/gui/NodesFragment.java
rename to src/main/java/com/nutomic/syncthingandroid/fragments/NodesFragment.java
index 827fa989..38b1ad03 100644
--- a/src/main/java/com/nutomic/syncthingandroid/gui/NodesFragment.java
+++ b/src/main/java/com/nutomic/syncthingandroid/fragments/NodesFragment.java
@@ -1,4 +1,4 @@
-package com.nutomic.syncthingandroid.gui;
+package com.nutomic.syncthingandroid.fragments;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -8,6 +8,8 @@ import android.widget.AdapterView;
 import android.widget.ListView;
 
 import com.nutomic.syncthingandroid.R;
+import com.nutomic.syncthingandroid.activities.MainActivity;
+import com.nutomic.syncthingandroid.activities.SettingsActivity;
 import com.nutomic.syncthingandroid.syncthing.SyncthingService;
 import com.nutomic.syncthingandroid.util.NodesAdapter;
 
diff --git a/src/main/java/com/nutomic/syncthingandroid/gui/RepoSettingsFragment.java b/src/main/java/com/nutomic/syncthingandroid/fragments/RepoSettingsFragment.java
similarity index 96%
rename from src/main/java/com/nutomic/syncthingandroid/gui/RepoSettingsFragment.java
rename to src/main/java/com/nutomic/syncthingandroid/fragments/RepoSettingsFragment.java
index 4c7bf580..707d7178 100644
--- a/src/main/java/com/nutomic/syncthingandroid/gui/RepoSettingsFragment.java
+++ b/src/main/java/com/nutomic/syncthingandroid/fragments/RepoSettingsFragment.java
@@ -1,7 +1,5 @@
-package com.nutomic.syncthingandroid.gui;
+package com.nutomic.syncthingandroid.fragments;
 
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.ComponentName;
@@ -9,7 +7,6 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.ServiceConnection;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.IBinder;
@@ -24,6 +21,8 @@ import android.view.MenuItem;
 import android.widget.Toast;
 
 import com.nutomic.syncthingandroid.R;
+import com.nutomic.syncthingandroid.activities.FolderPickerActivity;
+import com.nutomic.syncthingandroid.activities.SettingsActivity;
 import com.nutomic.syncthingandroid.syncthing.RestApi;
 import com.nutomic.syncthingandroid.syncthing.SyncthingService;
 import com.nutomic.syncthingandroid.syncthing.SyncthingServiceBinder;
@@ -42,7 +41,7 @@ public class RepoSettingsFragment extends PreferenceFragment
 	private static final int DIRECTORY_REQUEST_CODE = 234;
 
 	/**
-	 * The ID of the repo to be edited. To be used with {@link SettingsActivity#EXTRA_IS_CREATE}
+	 * The ID of the repo to be edited. To be used with {@link com.nutomic.syncthingandroid.activities.SettingsActivity#EXTRA_IS_CREATE}
 	 * set to false.
 	 */
 	public static final String EXTRA_REPO_ID = "repo_id";
diff --git a/src/main/java/com/nutomic/syncthingandroid/gui/ReposFragment.java b/src/main/java/com/nutomic/syncthingandroid/fragments/ReposFragment.java
similarity index 93%
rename from src/main/java/com/nutomic/syncthingandroid/gui/ReposFragment.java
rename to src/main/java/com/nutomic/syncthingandroid/fragments/ReposFragment.java
index 63ee4084..2d974fb9 100644
--- a/src/main/java/com/nutomic/syncthingandroid/gui/ReposFragment.java
+++ b/src/main/java/com/nutomic/syncthingandroid/fragments/ReposFragment.java
@@ -1,4 +1,4 @@
-package com.nutomic.syncthingandroid.gui;
+package com.nutomic.syncthingandroid.fragments;
 
 import android.content.Intent;
 import android.os.Bundle;
@@ -7,6 +7,8 @@ import android.view.View;
 import android.widget.AdapterView;
 
 import com.nutomic.syncthingandroid.R;
+import com.nutomic.syncthingandroid.activities.MainActivity;
+import com.nutomic.syncthingandroid.activities.SettingsActivity;
 import com.nutomic.syncthingandroid.syncthing.SyncthingService;
 import com.nutomic.syncthingandroid.util.ReposAdapter;
 
diff --git a/src/main/java/com/nutomic/syncthingandroid/gui/SettingsFragment.java b/src/main/java/com/nutomic/syncthingandroid/fragments/SettingsFragment.java
similarity index 98%
rename from src/main/java/com/nutomic/syncthingandroid/gui/SettingsFragment.java
rename to src/main/java/com/nutomic/syncthingandroid/fragments/SettingsFragment.java
index 52f8cfdb..276d16eb 100644
--- a/src/main/java/com/nutomic/syncthingandroid/gui/SettingsFragment.java
+++ b/src/main/java/com/nutomic/syncthingandroid/fragments/SettingsFragment.java
@@ -1,4 +1,4 @@
-package com.nutomic.syncthingandroid.gui;
+package com.nutomic.syncthingandroid.fragments;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -10,7 +10,6 @@ import android.preference.CheckBoxPreference;
 import android.preference.EditTextPreference;
 import android.preference.Preference;
 import android.preference.PreferenceScreen;
-import android.support.v4.app.Fragment;
 import android.support.v4.app.NavUtils;
 import android.support.v4.preference.PreferenceFragment;
 import android.support.v7.app.ActionBarActivity;
diff --git a/src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java b/src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java
index 6dc39e11..1ea8138c 100644
--- a/src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java
+++ b/src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java
@@ -17,9 +17,8 @@ import android.util.Log;
 import android.util.Pair;
 
 import com.nutomic.syncthingandroid.R;
-import com.nutomic.syncthingandroid.gui.MainActivity;
-import com.nutomic.syncthingandroid.gui.SettingsActivity;
-import com.nutomic.syncthingandroid.gui.SettingsFragment;
+import com.nutomic.syncthingandroid.activities.MainActivity;
+import com.nutomic.syncthingandroid.activities.SettingsActivity;
 import com.nutomic.syncthingandroid.util.ConfigXml;
 
 import org.apache.http.HttpResponse;