Refactoring

app/src/main/java/gr/thmmy/mthmmy/activities/create_content/CreateContentActivity.java

@@ -15,9 +15,9 @@ import com.google.android.material.textfield.TextInputLayout;
 import gr.thmmy.mthmmy.R;
 import gr.thmmy.mthmmy.activities.settings.SettingsActivity;
 import gr.thmmy.mthmmy.base.BaseActivity;
-import gr.thmmy.mthmmy.editorview.EditorView;
-import gr.thmmy.mthmmy.editorview.EmojiKeyboard;
 import gr.thmmy.mthmmy.session.SessionManager;
+import gr.thmmy.mthmmy.views.editorview.EditorView;
+import gr.thmmy.mthmmy.views.editorview.EmojiKeyboard;
 import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
 import timber.log.Timber;
 

app/src/main/java/gr/thmmy/mthmmy/activities/main/forum/ForumFragment.java

@@ -30,10 +30,10 @@ import gr.thmmy.mthmmy.base.BaseFragment;
 import gr.thmmy.mthmmy.model.Board;
 import gr.thmmy.mthmmy.model.Category;
 import gr.thmmy.mthmmy.session.SessionManager;
-import gr.thmmy.mthmmy.utils.CustomRecyclerView;
 import gr.thmmy.mthmmy.utils.NetworkResultCodes;
 import gr.thmmy.mthmmy.utils.parsing.NewParseTask;
 import gr.thmmy.mthmmy.utils.parsing.ParseException;
+import gr.thmmy.mthmmy.views.CustomRecyclerView;
 import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
 import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;

app/src/main/java/gr/thmmy/mthmmy/activities/main/recent/RecentAdapter.java

@@ -14,7 +14,7 @@ import gr.thmmy.mthmmy.R;
 import gr.thmmy.mthmmy.base.BaseApplication;
 import gr.thmmy.mthmmy.base.BaseFragment;
 import gr.thmmy.mthmmy.model.TopicSummary;
-import gr.thmmy.mthmmy.utils.RelativeTimeTextView;
+import gr.thmmy.mthmmy.views.RelativeTimeTextView;
 import timber.log.Timber;
 
 

app/src/main/java/gr/thmmy/mthmmy/activities/main/recent/RecentFragment.java

@@ -26,10 +26,10 @@ import gr.thmmy.mthmmy.base.BaseApplication;
 import gr.thmmy.mthmmy.base.BaseFragment;
 import gr.thmmy.mthmmy.model.TopicSummary;
 import gr.thmmy.mthmmy.session.SessionManager;
-import gr.thmmy.mthmmy.utils.CustomRecyclerView;
 import gr.thmmy.mthmmy.utils.NetworkResultCodes;
 import gr.thmmy.mthmmy.utils.parsing.NewParseTask;
 import gr.thmmy.mthmmy.utils.parsing.ParseException;
+import gr.thmmy.mthmmy.views.CustomRecyclerView;
 import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
 import okhttp3.Response;
 import timber.log.Timber;

app/src/main/java/gr/thmmy/mthmmy/activities/main/unread/UnreadAdapter.java

@@ -14,7 +14,7 @@ import gr.thmmy.mthmmy.R;
 import gr.thmmy.mthmmy.base.BaseApplication;
 import gr.thmmy.mthmmy.base.BaseFragment;
 import gr.thmmy.mthmmy.model.TopicSummary;
-import gr.thmmy.mthmmy.utils.RelativeTimeTextView;
+import gr.thmmy.mthmmy.views.RelativeTimeTextView;
 import timber.log.Timber;
 
 class UnreadAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {

app/src/main/java/gr/thmmy/mthmmy/activities/main/unread/UnreadFragment.java

@@ -31,10 +31,10 @@ import gr.thmmy.mthmmy.R;
 import gr.thmmy.mthmmy.base.BaseFragment;
 import gr.thmmy.mthmmy.model.TopicSummary;
 import gr.thmmy.mthmmy.session.SessionManager;
-import gr.thmmy.mthmmy.utils.CustomRecyclerView;
 import gr.thmmy.mthmmy.utils.NetworkResultCodes;
 import gr.thmmy.mthmmy.utils.parsing.NewParseTask;
 import gr.thmmy.mthmmy.utils.parsing.ParseException;
+import gr.thmmy.mthmmy.views.CustomRecyclerView;
 import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
 import okhttp3.Request;
 import okhttp3.Response;

app/src/main/java/gr/thmmy/mthmmy/activities/profile/ProfileActivity.java

@@ -46,12 +46,12 @@ import gr.thmmy.mthmmy.activities.topic.TopicActivity;
 import gr.thmmy.mthmmy.base.BaseActivity;
 import gr.thmmy.mthmmy.model.PostSummary;
 import gr.thmmy.mthmmy.model.ThmmyPage;
-import gr.thmmy.mthmmy.utils.CenterVerticalSpan;
-import gr.thmmy.mthmmy.utils.CircleTransform;
 import gr.thmmy.mthmmy.utils.NetworkResultCodes;
 import gr.thmmy.mthmmy.utils.Parcel;
 import gr.thmmy.mthmmy.utils.parsing.NewParseTask;
 import gr.thmmy.mthmmy.utils.parsing.ParseException;
+import gr.thmmy.mthmmy.utils.ui.CenterVerticalSpan;
+import gr.thmmy.mthmmy.utils.ui.CircleTransform;
 import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
 import okhttp3.Response;
 import timber.log.Timber;

app/src/main/java/gr/thmmy/mthmmy/activities/profile/latestPosts/LatestPostsAdapter.java

@@ -18,7 +18,7 @@ import gr.thmmy.mthmmy.R;
 import gr.thmmy.mthmmy.base.BaseFragment;
 import gr.thmmy.mthmmy.model.PostSummary;
 import gr.thmmy.mthmmy.model.TopicSummary;
-import gr.thmmy.mthmmy.utils.WebViewOnTouchClickListener;
+import gr.thmmy.mthmmy.utils.ui.WebViewOnTouchClickListener;
 import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
 
 /**

app/src/main/java/gr/thmmy/mthmmy/activities/shoutbox/ShoutAdapter.java

@@ -23,7 +23,7 @@ import gr.thmmy.mthmmy.activities.profile.ProfileActivity;
 import gr.thmmy.mthmmy.activities.topic.TopicActivity;
 import gr.thmmy.mthmmy.model.Shout;
 import gr.thmmy.mthmmy.model.ThmmyPage;
-import gr.thmmy.mthmmy.utils.CustomRecyclerView;
+import gr.thmmy.mthmmy.views.CustomRecyclerView;
 
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static gr.thmmy.mthmmy.activities.board.BoardActivity.BUNDLE_BOARD_TITLE;

app/src/main/java/gr/thmmy/mthmmy/activities/shoutbox/ShoutboxFragment.java

@@ -19,13 +19,13 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 
 import gr.thmmy.mthmmy.R;
 import gr.thmmy.mthmmy.base.BaseApplication;
-import gr.thmmy.mthmmy.editorview.EditorView;
-import gr.thmmy.mthmmy.editorview.EmojiKeyboard;
 import gr.thmmy.mthmmy.model.Shout;
 import gr.thmmy.mthmmy.model.Shoutbox;
-import gr.thmmy.mthmmy.utils.CustomRecyclerView;
 import gr.thmmy.mthmmy.utils.NetworkResultCodes;
 import gr.thmmy.mthmmy.viewmodel.ShoutboxViewModel;
+import gr.thmmy.mthmmy.views.CustomRecyclerView;
+import gr.thmmy.mthmmy.views.editorview.EditorView;
+import gr.thmmy.mthmmy.views.editorview.EmojiKeyboard;
 import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
 import timber.log.Timber;
 

app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java

@@ -49,16 +49,16 @@ import gr.thmmy.mthmmy.activities.topic.tasks.ReplyTask;
 import gr.thmmy.mthmmy.activities.topic.tasks.TopicTask;
 import gr.thmmy.mthmmy.base.BaseActivity;
 import gr.thmmy.mthmmy.base.BaseApplication;
-import gr.thmmy.mthmmy.editorview.EmojiKeyboard;
 import gr.thmmy.mthmmy.model.Bookmark;
 import gr.thmmy.mthmmy.model.Post;
 import gr.thmmy.mthmmy.model.ThmmyPage;
 import gr.thmmy.mthmmy.model.TopicItem;
-import gr.thmmy.mthmmy.utils.CustomLinearLayoutManager;
 import gr.thmmy.mthmmy.utils.HTMLUtils;
 import gr.thmmy.mthmmy.utils.NetworkResultCodes;
 import gr.thmmy.mthmmy.utils.parsing.ParseHelpers;
 import gr.thmmy.mthmmy.viewmodel.TopicViewModel;
+import gr.thmmy.mthmmy.views.CustomLinearLayoutManager;
+import gr.thmmy.mthmmy.views.editorview.EmojiKeyboard;
 import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
 import timber.log.Timber;
 

app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java

@@ -65,18 +65,18 @@ import gr.thmmy.mthmmy.R;
 import gr.thmmy.mthmmy.activities.board.BoardActivity;
 import gr.thmmy.mthmmy.activities.profile.ProfileActivity;
 import gr.thmmy.mthmmy.base.BaseActivity;
-import gr.thmmy.mthmmy.editorview.EditorView;
-import gr.thmmy.mthmmy.editorview.IEmojiKeyboard;
 import gr.thmmy.mthmmy.model.Poll;
 import gr.thmmy.mthmmy.model.Post;
 import gr.thmmy.mthmmy.model.ThmmyFile;
 import gr.thmmy.mthmmy.model.ThmmyPage;
 import gr.thmmy.mthmmy.model.TopicItem;
-import gr.thmmy.mthmmy.utils.CircleTransform;
-import gr.thmmy.mthmmy.utils.WebViewOnTouchClickListener;
 import gr.thmmy.mthmmy.utils.parsing.ParseHelpers;
 import gr.thmmy.mthmmy.utils.parsing.ThmmyParser;
+import gr.thmmy.mthmmy.utils.ui.CircleTransform;
+import gr.thmmy.mthmmy.utils.ui.WebViewOnTouchClickListener;
 import gr.thmmy.mthmmy.viewmodel.TopicViewModel;
+import gr.thmmy.mthmmy.views.editorview.EditorView;
+import gr.thmmy.mthmmy.views.editorview.IEmojiKeyboard;
 import timber.log.Timber;
 
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;

app/src/main/java/gr/thmmy/mthmmy/activities/upload/UploadActivity.java

@@ -64,11 +64,11 @@ import gr.thmmy.mthmmy.base.BaseApplication;
 import gr.thmmy.mthmmy.model.UploadCategory;
 import gr.thmmy.mthmmy.model.UploadFile;
 import gr.thmmy.mthmmy.services.UploadsReceiver;
-import gr.thmmy.mthmmy.utils.AppCompatSpinnerWithoutDefault;
 import gr.thmmy.mthmmy.utils.FileUtils;
 import gr.thmmy.mthmmy.utils.TakePhoto;
 import gr.thmmy.mthmmy.utils.parsing.ParseException;
 import gr.thmmy.mthmmy.utils.parsing.ParseTask;
+import gr.thmmy.mthmmy.views.AppCompatSpinnerWithoutDefault;
 import me.zhanghai.android.materialprogressbar.MaterialProgressBar;
 import timber.log.Timber;
 

app/src/main/java/gr/thmmy/mthmmy/base/BaseApplication.java

@@ -40,7 +40,7 @@ import java.util.concurrent.TimeUnit;
 import gr.thmmy.mthmmy.BuildConfig;
 import gr.thmmy.mthmmy.R;
 import gr.thmmy.mthmmy.session.SessionManager;
-import gr.thmmy.mthmmy.utils.CrashReportingTree;
+import gr.thmmy.mthmmy.utils.crashreporting.CrashReportingTree;
 import io.fabric.sdk.android.Fabric;
 import okhttp3.CipherSuite;
 import okhttp3.ConnectionSpec;

app/src/main/java/gr/thmmy/mthmmy/utils/DateTimeUtils.java

@@ -8,13 +8,13 @@ import static android.text.format.DateUtils.MINUTE_IN_MILLIS;
 import static android.text.format.DateUtils.SECOND_IN_MILLIS;
 import static android.text.format.DateUtils.YEAR_IN_MILLIS;
 
-class DateTimeUtils {
+public class DateTimeUtils {
 
     private static final long MONTH_IN_MILLIS = 30*DAY_IN_MILLIS;
     private static final long DECADE_IN_MILLIS = 10*YEAR_IN_MILLIS;
 
     @VisibleForTesting
-    static String getRelativeTimeSpanString(long time) {
+    public static String getRelativeTimeSpanString(long time) {
         long now = System.currentTimeMillis();
 
         boolean past = (now >= time);

app/src/main/java/gr/thmmy/mthmmy/utils/NetworkTask.java

@@ -10,6 +10,7 @@ import java.io.IOException;
 
 import gr.thmmy.mthmmy.R;
 import gr.thmmy.mthmmy.base.BaseApplication;
+import gr.thmmy.mthmmy.utils.crashreporting.CrashReporter;
 import gr.thmmy.mthmmy.utils.parsing.ParseException;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -17,8 +18,7 @@ import okhttp3.Response;
 import timber.log.Timber;
 
 public abstract class NetworkTask<T> extends ExternalAsyncTask<String, Parcel<T>> {
-
+    private OnNetworkTaskFinishedListener<T> onNetworkTaskFinishedListener;
-    protected OnNetworkTaskFinishedListener<T> onNetworkTaskFinishedListener;
 
     public NetworkTask(OnTaskStartedListener onTaskStartedListener, OnTaskCancelledListener onTaskCancelledListener,
                        OnNetworkTaskFinishedListener<T> onNetworkTaskFinishedListener) {

app/src/main/java/gr/thmmy/mthmmy/utils/CrashReporter.java → app/src/main/java/gr/thmmy/mthmmy/utils/crashreporting/CrashReporter.java

@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.utils;
+package gr.thmmy.mthmmy.utils.crashreporting;
 
 import com.crashlytics.android.Crashlytics;
 

app/src/main/java/gr/thmmy/mthmmy/utils/CrashReportingTree.java → app/src/main/java/gr/thmmy/mthmmy/utils/crashreporting/CrashReportingTree.java

@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.utils;
+package gr.thmmy.mthmmy.utils.crashreporting;
 
 import android.util.Log;
 

app/src/main/java/gr/thmmy/mthmmy/utils/CenterVerticalSpan.java → app/src/main/java/gr/thmmy/mthmmy/utils/ui/CenterVerticalSpan.java

@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.utils;
+package gr.thmmy.mthmmy.utils.ui;
 
 import android.graphics.Canvas;
 import android.graphics.Paint;

app/src/main/java/gr/thmmy/mthmmy/utils/CircleTransform.java → app/src/main/java/gr/thmmy/mthmmy/utils/ui/CircleTransform.java

@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.utils;
+package gr.thmmy.mthmmy.utils.ui;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapShader;

app/src/main/java/gr/thmmy/mthmmy/utils/ScrollAwareFABBehavior.java → app/src/main/java/gr/thmmy/mthmmy/utils/ui/ScrollAwareFABBehavior.java

@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.utils;
+package gr.thmmy.mthmmy.utils.ui;
 
 import android.content.Context;
 import android.util.AttributeSet;

app/src/main/java/gr/thmmy/mthmmy/utils/ScrollAwareLinearBehavior.java → app/src/main/java/gr/thmmy/mthmmy/utils/ui/ScrollAwareLinearBehavior.java

@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.utils;
+package gr.thmmy.mthmmy.utils.ui;
 
 import android.animation.Animator;
 import android.content.Context;

app/src/main/java/gr/thmmy/mthmmy/utils/WebViewOnTouchClickListener.java → app/src/main/java/gr/thmmy/mthmmy/utils/ui/WebViewOnTouchClickListener.java

@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.utils;
+package gr.thmmy.mthmmy.utils.ui;
 
 import android.annotation.SuppressLint;
 import android.app.Dialog;

app/src/main/java/gr/thmmy/mthmmy/utils/AppCompatSpinnerWithoutDefault.java → app/src/main/java/gr/thmmy/mthmmy/views/AppCompatSpinnerWithoutDefault.java

@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.utils;
+package gr.thmmy.mthmmy.views;
 
 import android.annotation.SuppressLint;
 import android.content.Context;

app/src/main/java/gr/thmmy/mthmmy/utils/CustomLinearLayoutManager.java → app/src/main/java/gr/thmmy/mthmmy/views/CustomLinearLayoutManager.java

@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.utils;
+package gr.thmmy.mthmmy.views;
 
 import android.content.Context;
 

app/src/main/java/gr/thmmy/mthmmy/utils/CustomRecyclerView.java → app/src/main/java/gr/thmmy/mthmmy/views/CustomRecyclerView.java

@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.utils;
+package gr.thmmy.mthmmy.views;
 
 import android.content.Context;
 import android.util.AttributeSet;

app/src/main/java/gr/thmmy/mthmmy/utils/RelativeTimeTextView.java → app/src/main/java/gr/thmmy/mthmmy/views/RelativeTimeTextView.java

@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.utils;
+package gr.thmmy.mthmmy.views;
 
 import android.annotation.SuppressLint;
 import android.content.Context;

app/src/main/java/gr/thmmy/mthmmy/utils/ToggledBackgroundButton.java → app/src/main/java/gr/thmmy/mthmmy/views/ToggledBackgroundButton.java

@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.utils;
+package gr.thmmy.mthmmy.views;
 import android.content.Context;
 import android.util.AttributeSet;
 

app/src/main/java/gr/thmmy/mthmmy/editorview/EditorView.java → app/src/main/java/gr/thmmy/mthmmy/views/editorview/EditorView.java

@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.editorview;
+package gr.thmmy.mthmmy.views.editorview;
 
 import android.animation.Animator;
 import android.annotation.SuppressLint;

app/src/main/java/gr/thmmy/mthmmy/editorview/EmojiInputField.java → app/src/main/java/gr/thmmy/mthmmy/views/editorview/EmojiInputField.java

@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.editorview;
+package gr.thmmy.mthmmy.views.editorview;
 
 import android.view.inputmethod.InputConnection;
 

app/src/main/java/gr/thmmy/mthmmy/editorview/EmojiKeyboard.java → app/src/main/java/gr/thmmy/mthmmy/views/editorview/EmojiKeyboard.java

@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.editorview;
+package gr.thmmy.mthmmy.views.editorview;
 
 import android.content.Context;
 import android.os.Handler;

app/src/main/java/gr/thmmy/mthmmy/editorview/EmojiKeyboardAdapter.java → app/src/main/java/gr/thmmy/mthmmy/views/editorview/EmojiKeyboardAdapter.java

@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.editorview;
+package gr.thmmy.mthmmy.views.editorview;
 
 import android.graphics.drawable.AnimationDrawable;
 import android.view.LayoutInflater;

app/src/main/java/gr/thmmy/mthmmy/editorview/FormatButtonsAdapter.java → app/src/main/java/gr/thmmy/mthmmy/views/editorview/FormatButtonsAdapter.java

@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.editorview;
+package gr.thmmy.mthmmy.views.editorview;
 
 import android.view.LayoutInflater;
 import android.view.View;

app/src/main/java/gr/thmmy/mthmmy/editorview/IEmojiKeyboard.java → app/src/main/java/gr/thmmy/mthmmy/views/editorview/IEmojiKeyboard.java

@@ -1,4 +1,4 @@
-package gr.thmmy.mthmmy.editorview;
+package gr.thmmy.mthmmy.views.editorview;
 
 public interface IEmojiKeyboard {
     /**

app/src/main/res/layout-v21/activity_profile.xml

@@ -113,7 +113,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margins"
-        app:layout_behavior="gr.thmmy.mthmmy.utils.ScrollAwareFABBehavior"
+        app:layout_behavior="gr.thmmy.mthmmy.utils.ui.ScrollAwareFABBehavior"
         app:srcCompat="@drawable/ic_pm_fab"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
 

app/src/main/res/layout/activity_board.xml

@@ -62,6 +62,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margins"
-        app:layout_behavior="gr.thmmy.mthmmy.utils.ScrollAwareFABBehavior"
+        app:layout_behavior="gr.thmmy.mthmmy.utils.ui.ScrollAwareFABBehavior"
         app:srcCompat="@drawable/ic_add_fab" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/activity_create_content.xml

@@ -46,7 +46,7 @@
                 android:inputType="text"/>
         </com.google.android.material.textfield.TextInputLayout>
 
-        <gr.thmmy.mthmmy.editorview.EditorView
+        <gr.thmmy.mthmmy.views.editorview.EditorView
             android:id="@+id/main_content_editorview"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -55,7 +55,7 @@
             android:layout_marginEnd="16dp"
             app:hint="topic message"/>
 
-        <gr.thmmy.mthmmy.editorview.EmojiKeyboard
+        <gr.thmmy.mthmmy.views.editorview.EmojiKeyboard
             android:id="@+id/emoji_keyboard"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

app/src/main/res/layout/activity_downloads.xml

@@ -55,6 +55,6 @@
         android:layout_gravity="bottom|end"
         android:layout_marginBottom="@dimen/fab_margins"
         android:layout_marginEnd="@dimen/fab_margins"
-        app:layout_behavior="gr.thmmy.mthmmy.utils.ScrollAwareFABBehavior"
+        app:layout_behavior="gr.thmmy.mthmmy.utils.ui.ScrollAwareFABBehavior"
         app:srcCompat="@drawable/ic_file_upload_white_24dp"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/activity_profile.xml

@@ -112,7 +112,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margins"
-        app:layout_behavior="gr.thmmy.mthmmy.utils.ScrollAwareFABBehavior"
+        app:layout_behavior="gr.thmmy.mthmmy.utils.ui.ScrollAwareFABBehavior"
         app:srcCompat="@drawable/ic_pm_fab"/>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
 

app/src/main/res/layout/activity_topic.xml

@@ -51,7 +51,7 @@
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             tools:context="gr.thmmy.mthmmy.activities.topic.TopicActivity" />
 
-        <gr.thmmy.mthmmy.editorview.EmojiKeyboard
+        <gr.thmmy.mthmmy.views.editorview.EmojiKeyboard
             android:id="@+id/emoji_keyboard"
             android:layout_width="match_parent"
             android:layout_height="240dp"
@@ -78,7 +78,7 @@
         android:layout_gravity="bottom|end"
         android:background="@color/primary"
         app:elevation="8dp"
-        app:layout_behavior="gr.thmmy.mthmmy.utils.ScrollAwareLinearBehavior">
+        app:layout_behavior="gr.thmmy.mthmmy.utils.ui.ScrollAwareLinearBehavior">
 
         <ImageButton
             android:id="@+id/page_first_button"
@@ -148,7 +148,7 @@
         android:layout_gravity="bottom|end"
         android:layout_marginEnd="@dimen/fab_margins"
         android:layout_marginBottom="50dp"
-        app:layout_behavior="gr.thmmy.mthmmy.utils.ScrollAwareFABBehavior"
+        app:layout_behavior="gr.thmmy.mthmmy.utils.ui.ScrollAwareFABBehavior"
         app:srcCompat="@drawable/ic_reply" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
 

app/src/main/res/layout/activity_topic_edit_row.xml

@@ -76,7 +76,7 @@
                     android:textSize="10sp"
                     tools:ignore="SmallSp" />
             </RelativeLayout>
-            <gr.thmmy.mthmmy.editorview.EditorView
+            <gr.thmmy.mthmmy.views.editorview.EditorView
                 android:id="@+id/edit_editorview"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"

app/src/main/res/layout/activity_topic_quick_reply_row.xml

@@ -76,7 +76,7 @@
                     android:textSize="10sp"
                     tools:ignore="SmallSp" />
             </RelativeLayout>
-            <gr.thmmy.mthmmy.editorview.EditorView
+            <gr.thmmy.mthmmy.views.editorview.EditorView
                 android:id="@+id/reply_editorview"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"

app/src/main/res/layout/activity_upload.xml

@@ -49,7 +49,7 @@
                 android:background="@color/primary_light"
                 android:orientation="vertical">
 
-                <gr.thmmy.mthmmy.utils.AppCompatSpinnerWithoutDefault
+                <gr.thmmy.mthmmy.views.AppCompatSpinnerWithoutDefault
                     android:id="@+id/upload_spinner_category_root"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -118,7 +118,7 @@
                     android:inputType="textMultiLine" />
             </com.google.android.material.textfield.TextInputLayout>
 
-            <gr.thmmy.mthmmy.utils.ToggledBackgroundButton
+            <gr.thmmy.mthmmy.views.ToggledBackgroundButton
                 android:id="@+id/upload_title_description_builder"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -195,7 +195,7 @@
         android:layout_gravity="bottom|end"
         android:layout_marginEnd="@dimen/fab_margins"
         android:layout_marginBottom="@dimen/fab_margins"
-        app:layout_behavior="gr.thmmy.mthmmy.utils.ScrollAwareFABBehavior"
+        app:layout_behavior="gr.thmmy.mthmmy.utils.ui.ScrollAwareFABBehavior"
         app:srcCompat="@drawable/ic_file_upload_white_24dp" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/fragment_forum.xml

@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <gr.thmmy.mthmmy.utils.CustomRecyclerView
+        <gr.thmmy.mthmmy.views.CustomRecyclerView
             android:id="@+id/list"
             android:name="gr.thmmy.mthmmy.sections.forum.ForumFragment"
             android:layout_width="match_parent"

app/src/main/res/layout/fragment_recent.xml

@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <gr.thmmy.mthmmy.utils.CustomRecyclerView
+        <gr.thmmy.mthmmy.views.CustomRecyclerView
             android:id="@+id/list"
             android:name="gr.thmmy.mthmmy.sections.recent.RecentFragment"
             android:layout_width="match_parent"

app/src/main/res/layout/fragment_recent_row.xml

@@ -32,7 +32,7 @@
             android:layout_below="@+id/title"
             android:layout_toEndOf="@+id/dateTime"/>
 
-        <gr.thmmy.mthmmy.utils.RelativeTimeTextView
+        <gr.thmmy.mthmmy.views.RelativeTimeTextView
             android:id="@+id/dateTime"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

app/src/main/res/layout/fragment_shoutbox.xml

@@ -16,14 +16,14 @@
         app:mpb_indeterminateTint="@color/accent"
         app:mpb_progressStyle="horizontal" />
 
-    <gr.thmmy.mthmmy.utils.CustomRecyclerView
+    <gr.thmmy.mthmmy.views.CustomRecyclerView
         android:id="@+id/shoutbox_recyclerview"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
         tools:listitem="@layout/fragment_shoutbox_shout_row" />
 
-    <gr.thmmy.mthmmy.editorview.EditorView
+    <gr.thmmy.mthmmy.views.editorview.EditorView
         android:id="@+id/edior_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -32,7 +32,7 @@
         android:paddingTop="8dp"
         android:visibility="gone"/>
 
-    <gr.thmmy.mthmmy.editorview.EmojiKeyboard
+    <gr.thmmy.mthmmy.views.editorview.EmojiKeyboard
         android:id="@+id/emoji_keyboard"
         android:layout_width="match_parent"
         android:layout_height="180dp"

app/src/main/res/layout/fragment_unread.xml

@@ -17,7 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <gr.thmmy.mthmmy.utils.CustomRecyclerView
+            <gr.thmmy.mthmmy.views.CustomRecyclerView
                 android:id="@+id/list"
                 android:name="gr.thmmy.mthmmy.sections.unread.UnreadFragment"
                 android:layout_width="match_parent"
@@ -59,6 +59,6 @@
         android:layout_gravity="bottom|end"
         android:layout_marginEnd="@dimen/fab_margins"
         android:layout_marginBottom="@dimen/fab_margins"
-        app:layout_behavior="gr.thmmy.mthmmy.utils.ScrollAwareFABBehavior"
+        app:layout_behavior="gr.thmmy.mthmmy.utils.ui.ScrollAwareFABBehavior"
         app:srcCompat="@drawable/ic_mark_as_read" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>

app/src/main/res/layout/fragment_unread_row.xml

@@ -32,7 +32,7 @@
             android:layout_below="@+id/title"
             android:layout_toEndOf="@+id/dateTime"/>
 
-        <gr.thmmy.mthmmy.utils.RelativeTimeTextView
+        <gr.thmmy.mthmmy.views.RelativeTimeTextView
             android:id="@+id/dateTime"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"

build.gradle

@@ -11,7 +11,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.6.3'
         classpath 'com.google.gms:google-services:4.3.3'
-        classpath 'io.fabric.tools:gradle:1.29.0'
+        classpath 'io.fabric.tools:gradle:1.31.2'
         classpath 'org.ajoberstar.grgit:grgit-core:3.1.1' // Also change in app/gradle/grgit.gradle
         classpath "com.github.ben-manes:gradle-versions-plugin:0.21.0"
     }

emojis/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 
 android {
     compileSdkVersion 29
-    buildToolsVersion "29.0.2"
+    buildToolsVersion "29.0.3"
 
 
     defaultConfig {