moved entities, created some additional packages

src/main/java/adonai/diary_browser/DiaryListActivity.java

@@ -3,7 +3,6 @@
 import android.animation.Animator;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
-import android.annotation.SuppressLint;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
@@ -57,15 +56,15 @@
 
 import adonai.diary_browser.database.DbProvider;
 import adonai.diary_browser.entities.AutocompleteItem;
-import adonai.diary_browser.entities.Comment;
-import adonai.diary_browser.entities.CommentsPage;
-import adonai.diary_browser.entities.DiaryListArrayAdapter;
-import adonai.diary_browser.entities.DiaryPage;
-import adonai.diary_browser.entities.DiscListArrayAdapter;
-import adonai.diary_browser.entities.DiscPage;
-import adonai.diary_browser.entities.ListPage;
-import adonai.diary_browser.entities.Post;
-import adonai.diary_browser.entities.WebPage;
+import adonai.diary_browser.pages.Comment;
+import adonai.diary_browser.pages.CommentsPage;
+import adonai.diary_browser.adapters.DiaryListArrayAdapter;
+import adonai.diary_browser.pages.DiaryPage;
+import adonai.diary_browser.adapters.DiscListArrayAdapter;
+import adonai.diary_browser.pages.DiscPage;
+import adonai.diary_browser.pages.ListPage;
+import adonai.diary_browser.pages.Post;
+import adonai.diary_browser.pages.WebPage;
 import adonai.diary_browser.misc.ArrowDrawable;
 import adonai.diary_browser.preferences.PreferencePage;
 

src/main/java/adonai/diary_browser/DiaryListFragment.java

@@ -15,7 +15,6 @@
 import android.view.SubMenu;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -26,14 +25,12 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.sql.SQLException;
-import java.util.List;
 
 import adonai.diary_browser.database.DbProvider;
 import adonai.diary_browser.entities.AutocompleteItem;
 import adonai.diary_browser.entities.AutocompleteItem.AutocompleteType;
-import adonai.diary_browser.entities.CommentsPage;
-import adonai.diary_browser.entities.DiaryPage;
-import adonai.diary_browser.entities.ListPage;
+import adonai.diary_browser.pages.CommentsPage;
+import adonai.diary_browser.pages.DiaryPage;
 
 /**
  * Фрагмент основной активности дайри, отвечающий за обработку пунктов меню и кнопок {@link ActionBar}'a

src/main/java/adonai/diary_browser/DiaryWebView.java

@@ -1,8 +1,6 @@
 package adonai.diary_browser;
 
 import android.annotation.SuppressLint;
-import android.content.ClipData;
-import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -11,12 +9,8 @@
 import android.os.Message;
 import android.util.AttributeSet;
 import android.util.Pair;
-import android.util.TypedValue;
-import android.view.ActionMode;
 import android.view.GestureDetector;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.animation.Animation;
@@ -34,7 +28,7 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 
-import adonai.diary_browser.entities.Umail;
+import adonai.diary_browser.pages.Umail;
 
 @SuppressLint("SetJavaScriptEnabled")
 public class DiaryWebView extends FrameLayout implements View.OnClickListener {

src/main/java/adonai/diary_browser/MessageSenderFragment.java

@@ -85,14 +85,13 @@
 
 import adonai.diary_browser.database.DbProvider;
 import adonai.diary_browser.entities.AutocompleteItem;
-import adonai.diary_browser.entities.Comment;
-import adonai.diary_browser.entities.CredentialsItem;
-import adonai.diary_browser.entities.DraftListArrayAdapter;
-import adonai.diary_browser.entities.ImgurImageResponse;
-import adonai.diary_browser.entities.PleerEmbedAnswer;
-import adonai.diary_browser.entities.PleerUploadAnswer;
-import adonai.diary_browser.entities.Post;
-import adonai.diary_browser.entities.Umail;
+import adonai.diary_browser.pages.Comment;
+import adonai.diary_browser.adapters.DraftListArrayAdapter;
+import adonai.diary_browser.dto.ImgurImageResponse;
+import adonai.diary_browser.adapters.PleerEmbedAnswer;
+import adonai.diary_browser.adapters.PleerUploadAnswer;
+import adonai.diary_browser.pages.Post;
+import adonai.diary_browser.pages.Umail;
 import adonai.diary_browser.misc.FileUtils;
 import adonai.diary_browser.misc.SemicolonTokenizer;
 import pl.droidsonroids.gif.GifDrawable;

src/main/java/adonai/diary_browser/NetworkService.java

@@ -47,22 +47,22 @@
 import java.util.List;
 
 import adonai.diary_browser.database.DbProvider;
-import adonai.diary_browser.entities.Comment;
-import adonai.diary_browser.entities.CommentsPage;
+import adonai.diary_browser.pages.Comment;
+import adonai.diary_browser.pages.CommentsPage;
 import adonai.diary_browser.entities.CredentialsItem;
-import adonai.diary_browser.entities.DiaryLinkList;
-import adonai.diary_browser.entities.DiaryPage;
-import adonai.diary_browser.entities.DiaryProfilePage;
-import adonai.diary_browser.entities.DiscListPage;
-import adonai.diary_browser.entities.DiscPage;
-import adonai.diary_browser.entities.ListPage;
-import adonai.diary_browser.entities.Post;
-import adonai.diary_browser.entities.SearchPage;
-import adonai.diary_browser.entities.TagsPage;
-import adonai.diary_browser.entities.Umail;
-import adonai.diary_browser.entities.UmailListPage;
-import adonai.diary_browser.entities.UmailPage;
-import adonai.diary_browser.entities.WebPage;
+import adonai.diary_browser.pages.DiaryLinkList;
+import adonai.diary_browser.pages.DiaryPage;
+import adonai.diary_browser.pages.DiaryProfilePage;
+import adonai.diary_browser.pages.DiscListPage;
+import adonai.diary_browser.pages.DiscPage;
+import adonai.diary_browser.pages.ListPage;
+import adonai.diary_browser.pages.Post;
+import adonai.diary_browser.pages.SearchPage;
+import adonai.diary_browser.pages.TagsPage;
+import adonai.diary_browser.pages.Umail;
+import adonai.diary_browser.pages.UmailListPage;
+import adonai.diary_browser.pages.UmailPage;
+import adonai.diary_browser.pages.WebPage;
 
 public class NetworkService extends Service implements Callback, OnSharedPreferenceChangeListener {
 

src/main/java/adonai/diary_browser/UmailListActivity.java

@@ -24,14 +24,11 @@
 import android.widget.TabWidget;
 import android.widget.TextView;
 
-import com.afollestad.materialdialogs.AlertDialogWrapper;
-
-import adonai.diary_browser.entities.ListPage;
-import adonai.diary_browser.entities.Umail;
-import adonai.diary_browser.entities.UmailListArrayAdapter;
-import adonai.diary_browser.entities.UmailListPage;
-import adonai.diary_browser.entities.UmailPage;
-import adonai.diary_browser.entities.WebPage;
+import adonai.diary_browser.pages.ListPage;
+import adonai.diary_browser.pages.Umail;
+import adonai.diary_browser.adapters.UmailListArrayAdapter;
+import adonai.diary_browser.pages.UmailPage;
+import adonai.diary_browser.pages.WebPage;
 import adonai.diary_browser.preferences.PreferencePage;
 
 /**

src/main/java/adonai/diary_browser/UserData.java

@@ -3,13 +3,13 @@
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
-import adonai.diary_browser.entities.DiaryLinkList;
-import adonai.diary_browser.entities.DiaryPage;
-import adonai.diary_browser.entities.DiscListPage;
-import adonai.diary_browser.entities.ListPage;
-import adonai.diary_browser.entities.UmailListPage;
-import adonai.diary_browser.entities.UmailPage;
-import adonai.diary_browser.entities.WebPage;
+import adonai.diary_browser.pages.DiaryLinkList;
+import adonai.diary_browser.pages.DiaryPage;
+import adonai.diary_browser.pages.DiscListPage;
+import adonai.diary_browser.pages.ListPage;
+import adonai.diary_browser.pages.UmailListPage;
+import adonai.diary_browser.pages.UmailPage;
+import adonai.diary_browser.pages.WebPage;
 
 /**
  * Синглетон данных пользователя в текущем сеансе.

src/main/java/adonai/diary_browser/Utils.java

@@ -13,13 +13,13 @@
 import java.io.InputStreamReader;
 import java.io.StringWriter;
 
-import adonai.diary_browser.entities.CommentsPage;
-import adonai.diary_browser.entities.DiaryLinkList;
-import adonai.diary_browser.entities.DiaryPage;
-import adonai.diary_browser.entities.DiaryProfilePage;
-import adonai.diary_browser.entities.DiscListPage;
-import adonai.diary_browser.entities.SearchPage;
-import adonai.diary_browser.entities.TagsPage;
+import adonai.diary_browser.pages.CommentsPage;
+import adonai.diary_browser.pages.DiaryLinkList;
+import adonai.diary_browser.pages.DiaryPage;
+import adonai.diary_browser.pages.DiaryProfilePage;
+import adonai.diary_browser.pages.DiscListPage;
+import adonai.diary_browser.pages.SearchPage;
+import adonai.diary_browser.pages.TagsPage;
 
 /**
  * Класс-свалка полезных функций и констант.

src/main/java/adonai/diary_browser/entities/DiaryListArrayAdapter.java → src/main/java/adonai/diary_browser/adapters/DiaryListArrayAdapter.java

@@ -1,18 +1,17 @@
-package adonai.diary_browser.entities;
+package adonai.diary_browser.adapters;
 
 import android.content.Context;
-import android.graphics.Color;
-import android.graphics.Typeface;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.TextView;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import adonai.diary_browser.R;
+import adonai.diary_browser.pages.ListPage;
+import adonai.diary_browser.pages.UmailListPage;
 
 public class DiaryListArrayAdapter extends ArrayAdapter<ListPage> {
 

src/main/java/adonai/diary_browser/entities/DiscListArrayAdapter.java → src/main/java/adonai/diary_browser/adapters/DiscListArrayAdapter.java

@@ -1,4 +1,4 @@
-package adonai.diary_browser.entities;
+package adonai.diary_browser.adapters;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -9,6 +9,8 @@
 import android.widget.TextView;
 
 import adonai.diary_browser.R;
+import adonai.diary_browser.pages.DiscListPage;
+import adonai.diary_browser.pages.DiscPage;
 
 public class DiscListArrayAdapter extends BaseExpandableListAdapter {
     DiscListPage discussions;

src/main/java/adonai/diary_browser/entities/DraftListArrayAdapter.java → src/main/java/adonai/diary_browser/adapters/DraftListArrayAdapter.java

@@ -1,4 +1,4 @@
-package adonai.diary_browser.entities;
+package adonai.diary_browser.adapters;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -10,6 +10,7 @@
 import java.util.List;
 
 import adonai.diary_browser.R;
+import adonai.diary_browser.pages.Post;
 
 public class DraftListArrayAdapter extends ArrayAdapter<Post> {
 

src/main/java/adonai/diary_browser/entities/PleerEmbedAnswer.java → src/main/java/adonai/diary_browser/adapters/PleerEmbedAnswer.java

@@ -1,4 +1,4 @@
-package adonai.diary_browser.entities;
+package adonai.diary_browser.adapters;
 
 /**
  * Wrapper around ProstoPleer answer for http://pleer.com/site_api/embed/track POST

src/main/java/adonai/diary_browser/entities/PleerUploadAnswer.java → src/main/java/adonai/diary_browser/adapters/PleerUploadAnswer.java

@@ -1,4 +1,4 @@
-package adonai.diary_browser.entities;
+package adonai.diary_browser.adapters;
 
 /**
  * Wrapper around ProstoPleer answer for pleer.com/upload POST

src/main/java/adonai/diary_browser/entities/UmailListArrayAdapter.java → src/main/java/adonai/diary_browser/adapters/UmailListArrayAdapter.java

@@ -1,4 +1,4 @@
-package adonai.diary_browser.entities;
+package adonai.diary_browser.adapters;
 
 import android.content.Context;
 import android.graphics.Typeface;
@@ -15,6 +15,7 @@
 import java.util.List;
 
 import adonai.diary_browser.R;
+import adonai.diary_browser.pages.UmailListPage;
 
 public class UmailListArrayAdapter extends ArrayAdapter<UmailListPage> {
     ArrayList<Long> checkedIds = new ArrayList<>();

src/main/java/adonai/diary_browser/entities/ImgurImageResponse.java → src/main/java/adonai/diary_browser/dto/ImgurImageResponse.java

@@ -1,4 +1,4 @@
-package adonai.diary_browser.entities;
+package adonai.diary_browser.dto;
 
 /**
  * Wrapper around Imgur answer for https://api.imgur.com/3/image POST

src/main/java/adonai/diary_browser/entities/Comment.java → src/main/java/adonai/diary_browser/pages/Comment.java

@@ -1,4 +1,4 @@
-package adonai.diary_browser.entities;
+package adonai.diary_browser.pages;
 
 import java.io.Serializable;
 

src/main/java/adonai/diary_browser/entities/CommentsPage.java → src/main/java/adonai/diary_browser/pages/CommentsPage.java

@@ -1,4 +1,4 @@
-package adonai.diary_browser.entities;
+package adonai.diary_browser.pages;
 
 public class CommentsPage extends DiaryPage {
     private String postId = "";

src/main/java/adonai/diary_browser/entities/DiaryLinkList.java → src/main/java/adonai/diary_browser/pages/DiaryLinkList.java

@@ -1,4 +1,4 @@
-package adonai.diary_browser.entities;
+package adonai.diary_browser.pages;
 
 import android.text.Spanned;
 

src/main/java/adonai/diary_browser/entities/DiaryPage.java → src/main/java/adonai/diary_browser/pages/DiaryPage.java

@@ -1,4 +1,4 @@
-package adonai.diary_browser.entities;
+package adonai.diary_browser.pages;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/adonai/diary_browser/entities/DiaryProfilePage.java → src/main/java/adonai/diary_browser/pages/DiaryProfilePage.java

@@ -1,4 +1,4 @@
-package adonai.diary_browser.entities;
+package adonai.diary_browser.pages;
 
 public class DiaryProfilePage extends WebPage {
     private String profileURL;

src/main/java/adonai/diary_browser/entities/DiscListPage.java → src/main/java/adonai/diary_browser/pages/DiscListPage.java

@@ -1,4 +1,4 @@
-package adonai.diary_browser.entities;
+package adonai.diary_browser.pages;
 
 import java.util.ArrayList;
 

src/main/java/adonai/diary_browser/entities/DiscPage.java → src/main/java/adonai/diary_browser/pages/DiscPage.java

@@ -1,4 +1,4 @@
-package adonai.diary_browser.entities;
+package adonai.diary_browser.pages;
 
 
 import java.util.ArrayList;

src/main/java/adonai/diary_browser/entities/ListPage.java → src/main/java/adonai/diary_browser/pages/ListPage.java

@@ -1,4 +1,4 @@
-package adonai.diary_browser.entities;
+package adonai.diary_browser.pages;
 
 /**
  * Элемент списка дневников

src/main/java/adonai/diary_browser/entities/Post.java → src/main/java/adonai/diary_browser/pages/Post.java

@@ -1,4 +1,4 @@
-package adonai.diary_browser.entities;
+package adonai.diary_browser.pages;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

src/main/java/adonai/diary_browser/entities/SearchPage.java → src/main/java/adonai/diary_browser/pages/SearchPage.java

@@ -1,4 +1,4 @@
-package adonai.diary_browser.entities;
+package adonai.diary_browser.pages;
 
 /**
  * Created by adonai on 27.05.14.

src/main/java/adonai/diary_browser/entities/TagsPage.java → src/main/java/adonai/diary_browser/pages/TagsPage.java

@@ -1,4 +1,4 @@
-package adonai.diary_browser.entities;
+package adonai.diary_browser.pages;
 
 public class TagsPage extends DiaryPage {
     public TagsPage(String diaryURL) {

src/main/java/adonai/diary_browser/entities/Umail.java → src/main/java/adonai/diary_browser/pages/Umail.java

@@ -1,4 +1,4 @@
-package adonai.diary_browser.entities;
+package adonai.diary_browser.pages;
 
 public class Umail extends Comment {
     public String receiver = "";

src/main/java/adonai/diary_browser/entities/UmailListPage.java → src/main/java/adonai/diary_browser/pages/UmailListPage.java

@@ -1,4 +1,4 @@
-package adonai.diary_browser.entities;
+package adonai.diary_browser.pages;
 
 /**
  * Элемент списка U-mail'ов

src/main/java/adonai/diary_browser/entities/UmailPage.java → src/main/java/adonai/diary_browser/pages/UmailPage.java

@@ -1,4 +1,4 @@
-package adonai.diary_browser.entities;
+package adonai.diary_browser.pages;
 
 public class UmailPage extends WebPage {
     private String umailID = "";

src/main/java/adonai/diary_browser/entities/WebPage.java → src/main/java/adonai/diary_browser/pages/WebPage.java

@@ -1,4 +1,4 @@
-package adonai.diary_browser.entities;
+package adonai.diary_browser.pages;
 
 public abstract class WebPage {
     private String content = "";