From b45d137ee8c795d238162da1b6f171b005fc4f44 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Mon, 12 Jan 2015 22:42:46 +0000
Subject: [PATCH] Moved widgets to i2p.bote.android.widget

---
 .../i2p/bote/android/EmailListFragment.java   |  6 +++---
 .../i2p/bote/android/NewEmailFragment.java    |  2 +-
 .../addressbook/AddressBookFragment.java      |  2 +-
 .../bote/android/config/SettingsActivity.java |  4 +---
 .../ContactsCompletionView.java               | 21 +++++++++++--------
 .../DividerItemDecoration.java                |  2 +-
 .../IntEditTextPreference.java                |  2 +-
 .../{util => widget}/LoadingRecyclerView.java |  2 +-
 .../MultiSwipeRefreshLayout.java              |  2 +-
 .../SummaryEditTextPreference.java            |  2 +-
 .../main/res/layout/fragment_list_emails.xml  |  2 +-
 .../fragment_list_emails_with_refresh.xml     |  6 +++---
 .../main/res/layout/fragment_new_email.xml    |  8 +++----
 app/src/main/res/xml/settings_general.xml     |  6 +++---
 14 files changed, 34 insertions(+), 33 deletions(-)
 rename app/src/main/java/i2p/bote/android/{util => widget}/ContactsCompletionView.java (96%)
 rename app/src/main/java/i2p/bote/android/{util => widget}/DividerItemDecoration.java (99%)
 rename app/src/main/java/i2p/bote/android/{util => widget}/IntEditTextPreference.java (97%)
 rename app/src/main/java/i2p/bote/android/{util => widget}/LoadingRecyclerView.java (98%)
 rename app/src/main/java/i2p/bote/android/{util => widget}/MultiSwipeRefreshLayout.java (99%)
 rename app/src/main/java/i2p/bote/android/{util => widget}/SummaryEditTextPreference.java (95%)

diff --git a/app/src/main/java/i2p/bote/android/EmailListFragment.java b/app/src/main/java/i2p/bote/android/EmailListFragment.java
index 024b20e..c191056 100644
--- a/app/src/main/java/i2p/bote/android/EmailListFragment.java
+++ b/app/src/main/java/i2p/bote/android/EmailListFragment.java
@@ -38,11 +38,11 @@ import i2p.bote.I2PBote;
 import i2p.bote.android.util.AuthenticatedFragment;
 import i2p.bote.android.util.BetterAsyncTaskLoader;
 import i2p.bote.android.util.BoteHelper;
-import i2p.bote.android.util.DividerItemDecoration;
-import i2p.bote.android.util.LoadingRecyclerView;
+import i2p.bote.android.widget.DividerItemDecoration;
+import i2p.bote.android.widget.LoadingRecyclerView;
 import i2p.bote.android.util.MoveToDialogFragment;
 import i2p.bote.android.util.MultiSelectionUtil;
-import i2p.bote.android.util.MultiSwipeRefreshLayout;
+import i2p.bote.android.widget.MultiSwipeRefreshLayout;
 import i2p.bote.email.Email;
 import i2p.bote.fileencryption.PasswordException;
 import i2p.bote.folder.EmailFolder;
diff --git a/app/src/main/java/i2p/bote/android/NewEmailFragment.java b/app/src/main/java/i2p/bote/android/NewEmailFragment.java
index 36bce2f..55d8294 100644
--- a/app/src/main/java/i2p/bote/android/NewEmailFragment.java
+++ b/app/src/main/java/i2p/bote/android/NewEmailFragment.java
@@ -47,7 +47,7 @@ import javax.mail.internet.InternetAddress;
 
 import i2p.bote.I2PBote;
 import i2p.bote.android.util.BoteHelper;
-import i2p.bote.android.util.ContactsCompletionView;
+import i2p.bote.android.widget.ContactsCompletionView;
 import i2p.bote.android.util.ContentAttachment;
 import i2p.bote.android.util.Person;
 import i2p.bote.email.Attachment;
diff --git a/app/src/main/java/i2p/bote/android/addressbook/AddressBookFragment.java b/app/src/main/java/i2p/bote/android/addressbook/AddressBookFragment.java
index d6e293f..61dad49 100644
--- a/app/src/main/java/i2p/bote/android/addressbook/AddressBookFragment.java
+++ b/app/src/main/java/i2p/bote/android/addressbook/AddressBookFragment.java
@@ -23,7 +23,7 @@ import i2p.bote.I2PBote;
 import i2p.bote.android.R;
 import i2p.bote.android.util.AuthenticatedFragment;
 import i2p.bote.android.util.BetterAsyncTaskLoader;
-import i2p.bote.android.util.DividerItemDecoration;
+import i2p.bote.android.widget.DividerItemDecoration;
 import i2p.bote.fileencryption.PasswordException;
 import i2p.bote.packet.dht.Contact;
 
diff --git a/app/src/main/java/i2p/bote/android/config/SettingsActivity.java b/app/src/main/java/i2p/bote/android/config/SettingsActivity.java
index fd3b8c3..b485594 100644
--- a/app/src/main/java/i2p/bote/android/config/SettingsActivity.java
+++ b/app/src/main/java/i2p/bote/android/config/SettingsActivity.java
@@ -4,14 +4,13 @@ import i2p.bote.Configuration;
 import i2p.bote.I2PBote;
 import i2p.bote.android.InitActivities;
 import i2p.bote.android.R;
-import i2p.bote.android.util.SummaryEditTextPreference;
+import i2p.bote.android.widget.SummaryEditTextPreference;
 import i2p.bote.email.EmailIdentity;
 import i2p.bote.fileencryption.PasswordException;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -30,7 +29,6 @@ import android.preference.PreferenceActivity;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
-import android.preference.PreferenceScreen;
 import android.support.v7.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.Menu;
diff --git a/app/src/main/java/i2p/bote/android/util/ContactsCompletionView.java b/app/src/main/java/i2p/bote/android/widget/ContactsCompletionView.java
similarity index 96%
rename from app/src/main/java/i2p/bote/android/util/ContactsCompletionView.java
rename to app/src/main/java/i2p/bote/android/widget/ContactsCompletionView.java
index fc78020..e0d8008 100644
--- a/app/src/main/java/i2p/bote/android/util/ContactsCompletionView.java
+++ b/app/src/main/java/i2p/bote/android/widget/ContactsCompletionView.java
@@ -1,13 +1,5 @@
-package i2p.bote.android.util;
+package i2p.bote.android.widget;
 
-import java.security.GeneralSecurityException;
-import java.util.SortedSet;
-
-import i2p.bote.I2PBote;
-import i2p.bote.android.R;
-import i2p.bote.email.EmailDestination;
-import i2p.bote.fileencryption.PasswordException;
-import i2p.bote.packet.dht.Contact;
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -21,6 +13,17 @@ import android.widget.TextView;
 
 import com.tokenautocomplete.TokenCompleteTextView;
 
+import java.security.GeneralSecurityException;
+import java.util.SortedSet;
+
+import i2p.bote.I2PBote;
+import i2p.bote.android.R;
+import i2p.bote.android.util.BoteHelper;
+import i2p.bote.android.util.Person;
+import i2p.bote.email.EmailDestination;
+import i2p.bote.fileencryption.PasswordException;
+import i2p.bote.packet.dht.Contact;
+
 public class ContactsCompletionView extends TokenCompleteTextView {
     public ContactsCompletionView(Context context, AttributeSet attrs) {
         super(context, attrs);
diff --git a/app/src/main/java/i2p/bote/android/util/DividerItemDecoration.java b/app/src/main/java/i2p/bote/android/widget/DividerItemDecoration.java
similarity index 99%
rename from app/src/main/java/i2p/bote/android/util/DividerItemDecoration.java
rename to app/src/main/java/i2p/bote/android/widget/DividerItemDecoration.java
index 70923f2..a09d3fa 100644
--- a/app/src/main/java/i2p/bote/android/util/DividerItemDecoration.java
+++ b/app/src/main/java/i2p/bote/android/widget/DividerItemDecoration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package i2p.bote.android.util;
+package i2p.bote.android.widget;
 
 import android.content.Context;
 import android.content.res.TypedArray;
diff --git a/app/src/main/java/i2p/bote/android/util/IntEditTextPreference.java b/app/src/main/java/i2p/bote/android/widget/IntEditTextPreference.java
similarity index 97%
rename from app/src/main/java/i2p/bote/android/util/IntEditTextPreference.java
rename to app/src/main/java/i2p/bote/android/widget/IntEditTextPreference.java
index 065a16f..af0443a 100644
--- a/app/src/main/java/i2p/bote/android/util/IntEditTextPreference.java
+++ b/app/src/main/java/i2p/bote/android/widget/IntEditTextPreference.java
@@ -1,4 +1,4 @@
-package i2p.bote.android.util;
+package i2p.bote.android.widget;
 
 import android.content.Context;
 import android.preference.EditTextPreference;
diff --git a/app/src/main/java/i2p/bote/android/util/LoadingRecyclerView.java b/app/src/main/java/i2p/bote/android/widget/LoadingRecyclerView.java
similarity index 98%
rename from app/src/main/java/i2p/bote/android/util/LoadingRecyclerView.java
rename to app/src/main/java/i2p/bote/android/widget/LoadingRecyclerView.java
index 989ebf5..c2e2e64 100644
--- a/app/src/main/java/i2p/bote/android/util/LoadingRecyclerView.java
+++ b/app/src/main/java/i2p/bote/android/widget/LoadingRecyclerView.java
@@ -1,4 +1,4 @@
-package i2p.bote.android.util;
+package i2p.bote.android.widget;
 
 import android.content.Context;
 import android.support.v7.widget.RecyclerView;
diff --git a/app/src/main/java/i2p/bote/android/util/MultiSwipeRefreshLayout.java b/app/src/main/java/i2p/bote/android/widget/MultiSwipeRefreshLayout.java
similarity index 99%
rename from app/src/main/java/i2p/bote/android/util/MultiSwipeRefreshLayout.java
rename to app/src/main/java/i2p/bote/android/widget/MultiSwipeRefreshLayout.java
index 66a8ba6..c65283c 100644
--- a/app/src/main/java/i2p/bote/android/util/MultiSwipeRefreshLayout.java
+++ b/app/src/main/java/i2p/bote/android/widget/MultiSwipeRefreshLayout.java
@@ -1,4 +1,4 @@
-package i2p.bote.android.util;
+package i2p.bote.android.widget;
 
 import android.content.Context;
 import android.support.v4.view.ViewCompat;
diff --git a/app/src/main/java/i2p/bote/android/util/SummaryEditTextPreference.java b/app/src/main/java/i2p/bote/android/widget/SummaryEditTextPreference.java
similarity index 95%
rename from app/src/main/java/i2p/bote/android/util/SummaryEditTextPreference.java
rename to app/src/main/java/i2p/bote/android/widget/SummaryEditTextPreference.java
index 0546bc0..1700927 100644
--- a/app/src/main/java/i2p/bote/android/util/SummaryEditTextPreference.java
+++ b/app/src/main/java/i2p/bote/android/widget/SummaryEditTextPreference.java
@@ -1,4 +1,4 @@
-package i2p.bote.android.util;
+package i2p.bote.android.widget;
 
 import android.content.Context;
 import android.preference.EditTextPreference;
diff --git a/app/src/main/res/layout/fragment_list_emails.xml b/app/src/main/res/layout/fragment_list_emails.xml
index c1f7f8c..ba505c5 100644
--- a/app/src/main/res/layout/fragment_list_emails.xml
+++ b/app/src/main/res/layout/fragment_list_emails.xml
@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <i2p.bote.android.util.LoadingRecyclerView
+        <i2p.bote.android.widget.LoadingRecyclerView
             android:id="@+id/emails_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/fragment_list_emails_with_refresh.xml b/app/src/main/res/layout/fragment_list_emails_with_refresh.xml
index 059c67a..b59f716 100644
--- a/app/src/main/res/layout/fragment_list_emails_with_refresh.xml
+++ b/app/src/main/res/layout/fragment_list_emails_with_refresh.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<i2p.bote.android.util.MultiSwipeRefreshLayout
+<i2p.bote.android.widget.MultiSwipeRefreshLayout
     android:id="@+id/swipe_refresh"
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -14,7 +14,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <i2p.bote.android.util.LoadingRecyclerView
+            <i2p.bote.android.widget.LoadingRecyclerView
                 android:id="@+id/emails_list"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -51,4 +51,4 @@
             app:fab_icon="@drawable/ic_create_white_24dp"/>
     </RelativeLayout>
 
-</i2p.bote.android.util.MultiSwipeRefreshLayout>
+</i2p.bote.android.widget.MultiSwipeRefreshLayout>
diff --git a/app/src/main/res/layout/fragment_new_email.xml b/app/src/main/res/layout/fragment_new_email.xml
index 79847fd..70a32ff 100644
--- a/app/src/main/res/layout/fragment_new_email.xml
+++ b/app/src/main/res/layout/fragment_new_email.xml
@@ -23,7 +23,7 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
-            <i2p.bote.android.util.ContactsCompletionView
+            <i2p.bote.android.widget.ContactsCompletionView
                 android:id="@+id/to"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -31,7 +31,7 @@
                 android:textColor="@color/primary_text_default_material_light">
 
                 <requestFocus/>
-            </i2p.bote.android.util.ContactsCompletionView>
+            </i2p.bote.android.widget.ContactsCompletionView>
 
             <ImageView
                 android:id="@+id/more"
@@ -42,14 +42,14 @@
                 android:src="@drawable/ic_unfold_more_grey600_24dp"/>
         </LinearLayout>
 
-        <i2p.bote.android.util.ContactsCompletionView
+        <i2p.bote.android.widget.ContactsCompletionView
             android:id="@+id/cc"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textColor="@color/primary_text_default_material_light"
             android:visibility="gone"/>
 
-        <i2p.bote.android.util.ContactsCompletionView
+        <i2p.bote.android.widget.ContactsCompletionView
             android:id="@+id/bcc"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/xml/settings_general.xml b/app/src/main/res/xml/settings_general.xml
index 4c8aa1c..9f19e0c 100644
--- a/app/src/main/res/xml/settings_general.xml
+++ b/app/src/main/res/xml/settings_general.xml
@@ -6,7 +6,7 @@
         android:key="autoMailCheckEnabled"
         android:title="@string/pref_title_autoMail" />
 
-    <i2p.bote.android.util.IntEditTextPreference
+    <i2p.bote.android.widget.IntEditTextPreference
         android:defaultValue="30"
         android:dependency="autoMailCheckEnabled"
         android:key="mailCheckInterval"
@@ -40,13 +40,13 @@
             android:key="numSendHops"
             android:title="@string/pref_title_numSendHops" />
 
-        <i2p.bote.android.util.IntEditTextPreference
+        <i2p.bote.android.widget.IntEditTextPreference
             android:defaultValue="5"
             android:dependency="numSendHops"
             android:key="relayMinDelay"
             android:summary="@string/pref_summ_minDelay"
             android:title="@string/pref_title_minDelay" />
-        <i2p.bote.android.util.IntEditTextPreference
+        <i2p.bote.android.widget.IntEditTextPreference
             android:defaultValue="40"
             android:dependency="numSendHops"
             android:key="relayMaxDelay"