From 9cba4e0ef0115af8a37e4414ec681cc8bd31f6a8 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Sat, 15 Oct 2016 16:32:13 +0900
Subject: [PATCH] Moved views to seperate package

---
 .../nutomic/syncthingandroid/fragments/DeviceListFragment.java | 3 +--
 .../nutomic/syncthingandroid/fragments/FolderListFragment.java | 3 +--
 .../nutomic/syncthingandroid/fragments/SettingsFragment.java   | 2 +-
 .../syncthingandroid/{util => views}/DevicesAdapter.java       | 3 ++-
 .../syncthingandroid/{widget => views}/EnhancedEditText.java   | 2 +-
 .../syncthingandroid/{util => views}/FoldersAdapter.java       | 3 ++-
 .../{preferences => views}/WifiSsidPreference.java             | 2 +-
 src/main/res/layout/fragment_device.xml                        | 2 +-
 src/main/res/xml/app_settings.xml                              | 2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)
 rename src/main/java/com/nutomic/syncthingandroid/{util => views}/DevicesAdapter.java (97%)
 rename src/main/java/com/nutomic/syncthingandroid/{widget => views}/EnhancedEditText.java (97%)
 rename src/main/java/com/nutomic/syncthingandroid/{util => views}/FoldersAdapter.java (98%)
 rename src/main/java/com/nutomic/syncthingandroid/{preferences => views}/WifiSsidPreference.java (99%)

diff --git a/src/main/java/com/nutomic/syncthingandroid/fragments/DeviceListFragment.java b/src/main/java/com/nutomic/syncthingandroid/fragments/DeviceListFragment.java
index aba9ab27..7b93fd6e 100644
--- a/src/main/java/com/nutomic/syncthingandroid/fragments/DeviceListFragment.java
+++ b/src/main/java/com/nutomic/syncthingandroid/fragments/DeviceListFragment.java
@@ -14,9 +14,8 @@ import com.nutomic.syncthingandroid.R;
 import com.nutomic.syncthingandroid.activities.SettingsActivity;
 import com.nutomic.syncthingandroid.activities.SyncthingActivity;
 import com.nutomic.syncthingandroid.model.Device;
-import com.nutomic.syncthingandroid.syncthing.RestApi;
 import com.nutomic.syncthingandroid.syncthing.SyncthingService;
-import com.nutomic.syncthingandroid.util.DevicesAdapter;
+import com.nutomic.syncthingandroid.views.DevicesAdapter;
 
 import java.util.Collections;
 import java.util.Comparator;
diff --git a/src/main/java/com/nutomic/syncthingandroid/fragments/FolderListFragment.java b/src/main/java/com/nutomic/syncthingandroid/fragments/FolderListFragment.java
index e269d3d2..9d6eafbb 100644
--- a/src/main/java/com/nutomic/syncthingandroid/fragments/FolderListFragment.java
+++ b/src/main/java/com/nutomic/syncthingandroid/fragments/FolderListFragment.java
@@ -14,9 +14,8 @@ import com.nutomic.syncthingandroid.R;
 import com.nutomic.syncthingandroid.activities.SettingsActivity;
 import com.nutomic.syncthingandroid.activities.SyncthingActivity;
 import com.nutomic.syncthingandroid.model.Folder;
-import com.nutomic.syncthingandroid.syncthing.RestApi;
 import com.nutomic.syncthingandroid.syncthing.SyncthingService;
-import com.nutomic.syncthingandroid.util.FoldersAdapter;
+import com.nutomic.syncthingandroid.views.FoldersAdapter;
 
 import java.util.Collections;
 import java.util.Comparator;
diff --git a/src/main/java/com/nutomic/syncthingandroid/fragments/SettingsFragment.java b/src/main/java/com/nutomic/syncthingandroid/fragments/SettingsFragment.java
index df3d8fd8..316118f7 100644
--- a/src/main/java/com/nutomic/syncthingandroid/fragments/SettingsFragment.java
+++ b/src/main/java/com/nutomic/syncthingandroid/fragments/SettingsFragment.java
@@ -18,7 +18,7 @@ import android.widget.Toast;
 import com.nutomic.syncthingandroid.R;
 import com.nutomic.syncthingandroid.activities.SyncthingActivity;
 import com.nutomic.syncthingandroid.model.Device;
-import com.nutomic.syncthingandroid.preferences.WifiSsidPreference;
+import com.nutomic.syncthingandroid.views.WifiSsidPreference;
 import com.nutomic.syncthingandroid.syncthing.RestApi;
 import com.nutomic.syncthingandroid.syncthing.SyncthingService;
 
diff --git a/src/main/java/com/nutomic/syncthingandroid/util/DevicesAdapter.java b/src/main/java/com/nutomic/syncthingandroid/views/DevicesAdapter.java
similarity index 97%
rename from src/main/java/com/nutomic/syncthingandroid/util/DevicesAdapter.java
rename to src/main/java/com/nutomic/syncthingandroid/views/DevicesAdapter.java
index bd5c96d9..15479539 100644
--- a/src/main/java/com/nutomic/syncthingandroid/util/DevicesAdapter.java
+++ b/src/main/java/com/nutomic/syncthingandroid/views/DevicesAdapter.java
@@ -1,4 +1,4 @@
-package com.nutomic.syncthingandroid.util;
+package com.nutomic.syncthingandroid.views;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -14,6 +14,7 @@ import com.nutomic.syncthingandroid.R;
 import com.nutomic.syncthingandroid.model.Connection;
 import com.nutomic.syncthingandroid.model.Device;
 import com.nutomic.syncthingandroid.syncthing.RestApi;
+import com.nutomic.syncthingandroid.util.Util;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/com/nutomic/syncthingandroid/widget/EnhancedEditText.java b/src/main/java/com/nutomic/syncthingandroid/views/EnhancedEditText.java
similarity index 97%
rename from src/main/java/com/nutomic/syncthingandroid/widget/EnhancedEditText.java
rename to src/main/java/com/nutomic/syncthingandroid/views/EnhancedEditText.java
index fc77c06c..3817158d 100644
--- a/src/main/java/com/nutomic/syncthingandroid/widget/EnhancedEditText.java
+++ b/src/main/java/com/nutomic/syncthingandroid/views/EnhancedEditText.java
@@ -1,4 +1,4 @@
-package com.nutomic.syncthingandroid.widget;
+package com.nutomic.syncthingandroid.views;
 
 import android.content.Context;
 import android.util.AttributeSet;
diff --git a/src/main/java/com/nutomic/syncthingandroid/util/FoldersAdapter.java b/src/main/java/com/nutomic/syncthingandroid/views/FoldersAdapter.java
similarity index 98%
rename from src/main/java/com/nutomic/syncthingandroid/util/FoldersAdapter.java
rename to src/main/java/com/nutomic/syncthingandroid/views/FoldersAdapter.java
index 56864c5d..981b4a21 100644
--- a/src/main/java/com/nutomic/syncthingandroid/util/FoldersAdapter.java
+++ b/src/main/java/com/nutomic/syncthingandroid/views/FoldersAdapter.java
@@ -1,4 +1,4 @@
-package com.nutomic.syncthingandroid.util;
+package com.nutomic.syncthingandroid.views;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
@@ -15,6 +15,7 @@ import com.nutomic.syncthingandroid.R;
 import com.nutomic.syncthingandroid.model.Folder;
 import com.nutomic.syncthingandroid.model.Model;
 import com.nutomic.syncthingandroid.syncthing.RestApi;
+import com.nutomic.syncthingandroid.util.Util;
 
 import java.util.HashMap;
 
diff --git a/src/main/java/com/nutomic/syncthingandroid/preferences/WifiSsidPreference.java b/src/main/java/com/nutomic/syncthingandroid/views/WifiSsidPreference.java
similarity index 99%
rename from src/main/java/com/nutomic/syncthingandroid/preferences/WifiSsidPreference.java
rename to src/main/java/com/nutomic/syncthingandroid/views/WifiSsidPreference.java
index 466fe22e..1ad37cf5 100644
--- a/src/main/java/com/nutomic/syncthingandroid/preferences/WifiSsidPreference.java
+++ b/src/main/java/com/nutomic/syncthingandroid/views/WifiSsidPreference.java
@@ -1,4 +1,4 @@
-package com.nutomic.syncthingandroid.preferences;
+package com.nutomic.syncthingandroid.views;
 
 import android.content.Context;
 import android.net.wifi.WifiConfiguration;
diff --git a/src/main/res/layout/fragment_device.xml b/src/main/res/layout/fragment_device.xml
index 55243fe0..c95bf1e4 100644
--- a/src/main/res/layout/fragment_device.xml
+++ b/src/main/res/layout/fragment_device.xml
@@ -21,7 +21,7 @@
             android:background="?selectableItemBackground"
             android:orientation="horizontal">
 
-            <com.nutomic.syncthingandroid.widget.EnhancedEditText
+            <com.nutomic.syncthingandroid.views.EnhancedEditText
                 android:id="@+id/id"
                 style="@style/Widget.Syncthing.TextView.Label.Details.Field"
                 android:layout_width="0dp"
diff --git a/src/main/res/xml/app_settings.xml b/src/main/res/xml/app_settings.xml
index f2df3be2..fce6b987 100644
--- a/src/main/res/xml/app_settings.xml
+++ b/src/main/res/xml/app_settings.xml
@@ -19,7 +19,7 @@
             android:title="@string/sync_only_wifi"
             android:defaultValue="false" />
 
-        <com.nutomic.syncthingandroid.preferences.WifiSsidPreference
+        <com.nutomic.syncthingandroid.views.WifiSsidPreference
             android:key="sync_only_wifi_ssids_set"
             android:title="@string/sync_only_wifi_ssids" />