Redefine 'view' package to 'views'

OpenVK · Dec 4, 2023 · fe8462a · fe8462a
1 parent 11b5fbe
commit fe8462a
Show file tree

Hide file tree

Showing 118 changed files with 323 additions and 418 deletions.
diff --git a/app/src/main/java/uk/openvk/android/legacy/ui/core/activities/AppActivity.java b/app/src/main/java/uk/openvk/android/legacy/ui/core/activities/AppActivity.java
@@ -44,7 +44,11 @@
 import uk.openvk.android.legacy.ui.list.adapters.AccountSlidingMenuAdapter;
 import uk.openvk.android.legacy.ui.list.adapters.SlidingMenuAdapter;
 import uk.openvk.android.legacy.ui.list.items.*;
-import uk.openvk.android.legacy.ui.view.layouts.*;
+import uk.openvk.android.legacy.ui.views.ActionBarLayout;
+import uk.openvk.android.legacy.ui.views.ErrorLayout;
+import uk.openvk.android.legacy.ui.views.ProgressLayout;
+import uk.openvk.android.legacy.ui.views.SlidingMenuLayout;
+import uk.openvk.android.legacy.ui.views.WallLayout;
 import uk.openvk.android.legacy.ui.wrappers.LocaleContextWrapper;
 
 /** Copyleft © 2022, 2023 OpenVK Team

diff --git a/app/src/main/java/uk/openvk/android/legacy/ui/core/activities/AuthActivity.java b/app/src/main/java/uk/openvk/android/legacy/ui/core/activities/AuthActivity.java
@@ -1,8 +1,6 @@
 package uk.openvk.android.legacy.ui.core.activities;
 
 import android.accounts.AccountManager;
-import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -11,9 +9,6 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
-import android.preference.PreferenceManager;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.util.Log;
@@ -27,7 +22,6 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Locale;
@@ -36,18 +30,14 @@
 import uk.openvk.android.legacy.Global;
 import uk.openvk.android.legacy.OvkApplication;
 import uk.openvk.android.legacy.R;
-import uk.openvk.android.legacy.api.OpenVKAPI;
 import uk.openvk.android.legacy.api.entities.Account;
 import uk.openvk.android.legacy.api.entities.Authorization;
 import uk.openvk.android.legacy.api.enumerations.HandlerMessages;
 import uk.openvk.android.legacy.api.wrappers.JSONParser;
-import uk.openvk.android.legacy.api.wrappers.OvkAPIWrapper;
 import uk.openvk.android.legacy.ui.OvkAlertDialog;
 import uk.openvk.android.legacy.ui.core.activities.base.NetworkAuthActivity;
-import uk.openvk.android.legacy.ui.core.activities.base.TranslucentAuthActivity;
-import uk.openvk.android.legacy.ui.list.items.InstanceAccount;
-import uk.openvk.android.legacy.ui.view.layouts.EditTextAction;
-import uk.openvk.android.legacy.ui.view.layouts.XLinearLayout;
+import uk.openvk.android.legacy.ui.views.EditTextAction;
+import uk.openvk.android.legacy.ui.views.base.XLinearLayout;
 import uk.openvk.android.legacy.ui.list.adapters.InstancesListAdapter;
 import uk.openvk.android.legacy.ui.list.items.InstancesListItem;
 import uk.openvk.android.legacy.ui.core.listeners.OnKeyboardStateListener;

diff --git a/app/src/main/java/uk/openvk/android/legacy/ui/core/activities/ConversationActivity.java b/app/src/main/java/uk/openvk/android/legacy/ui/core/activities/ConversationActivity.java
@@ -15,9 +15,6 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.os.Message;
 import android.preference.PreferenceManager;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -26,14 +23,12 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.FrameLayout;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListView;
@@ -48,24 +43,18 @@
 import java.util.Locale;
 
 import dev.tinelix.retro_ab.ActionBar;
-import uk.openvk.android.legacy.BuildConfig;
 import uk.openvk.android.legacy.OvkApplication;
 import uk.openvk.android.legacy.R;
-import uk.openvk.android.legacy.api.OpenVKAPI;
-import uk.openvk.android.legacy.api.interfaces.OvkAPIListeners;
-import uk.openvk.android.legacy.api.models.Messages;
 import uk.openvk.android.legacy.api.enumerations.HandlerMessages;
 import uk.openvk.android.legacy.api.entities.Conversation;
-import uk.openvk.android.legacy.api.wrappers.OvkAPIWrapper;
 import uk.openvk.android.legacy.receivers.LongPollReceiver;
 import uk.openvk.android.legacy.ui.OvkAlertDialog;
 import uk.openvk.android.legacy.ui.core.activities.base.NetworkFragmentActivity;
-import uk.openvk.android.legacy.ui.core.activities.base.TranslucentFragmentActivity;
 import uk.openvk.android.legacy.ui.core.enumerations.UiMessages;
 import uk.openvk.android.legacy.ui.core.listeners.OnKeyboardStateListener;
-import uk.openvk.android.legacy.ui.view.layouts.ConversationPanel;
+import uk.openvk.android.legacy.ui.views.ConversationPanel;
 import uk.openvk.android.legacy.ui.list.adapters.MessagesListAdapter;
-import uk.openvk.android.legacy.ui.view.layouts.XLinearLayout;
+import uk.openvk.android.legacy.ui.views.base.XLinearLayout;
 import uk.openvk.android.legacy.ui.wrappers.LocaleContextWrapper;
 
 /** Copyleft © 2022, 2023 OpenVK Team

diff --git a/app/src/main/java/uk/openvk/android/legacy/ui/core/activities/NewPostActivity.java b/app/src/main/java/uk/openvk/android/legacy/ui/core/activities/NewPostActivity.java
@@ -2,22 +2,18 @@
 
 import android.Manifest;
 import android.annotation.SuppressLint;
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.Looper;
-import android.os.Message;
 import android.preference.PreferenceManager;
 import android.provider.MediaStore;
 import android.support.v7.widget.LinearLayoutManager;
@@ -36,43 +32,32 @@
 import android.widget.ArrayAdapter;
 import android.widget.CheckedTextView;
 import android.widget.EditText;
-import android.widget.ImageButton;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 import org.json.JSONObject;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.Locale;
 
 import dev.tinelix.retro_ab.ActionBar;
 import dev.tinelix.twemojicon.EmojiconGridFragment;
 import dev.tinelix.twemojicon.EmojiconsFragment;
 import dev.tinelix.twemojicon.emoji.Emojicon;
-import uk.openvk.android.legacy.BuildConfig;
 import uk.openvk.android.legacy.Global;
 import uk.openvk.android.legacy.OvkApplication;
 import uk.openvk.android.legacy.R;
-import uk.openvk.android.legacy.api.OpenVKAPI;
 import uk.openvk.android.legacy.api.entities.Note;
 import uk.openvk.android.legacy.api.entities.Photo;
-import uk.openvk.android.legacy.api.entities.WallPost;
-import uk.openvk.android.legacy.api.interfaces.OvkAPIListeners;
 import uk.openvk.android.legacy.api.models.PhotoUploadParams;
 import uk.openvk.android.legacy.api.models.Wall;
 import uk.openvk.android.legacy.api.enumerations.HandlerMessages;
 import uk.openvk.android.legacy.ui.core.activities.base.NetworkFragmentActivity;
-import uk.openvk.android.legacy.ui.core.activities.base.TranslucentActivity;
-import uk.openvk.android.legacy.ui.core.activities.base.TranslucentFragmentActivity;
-import uk.openvk.android.legacy.ui.core.activities.intents.GroupIntentActivity;
-import uk.openvk.android.legacy.ui.core.activities.intents.ProfileIntentActivity;
 import uk.openvk.android.legacy.ui.core.listeners.OnKeyboardStateListener;
 import uk.openvk.android.legacy.ui.list.adapters.UploadableAttachmentsAdapter;
 import uk.openvk.android.legacy.ui.list.items.UploadableAttachment;
-import uk.openvk.android.legacy.ui.view.layouts.XLinearLayout;
+import uk.openvk.android.legacy.ui.views.base.XLinearLayout;
 import uk.openvk.android.legacy.ui.wrappers.LocaleContextWrapper;
 import uk.openvk.android.legacy.utils.RealPathUtil;
 

diff --git a/app/src/main/java/uk/openvk/android/legacy/ui/core/activities/PhotoViewerActivity.java b/app/src/main/java/uk/openvk/android/legacy/ui/core/activities/PhotoViewerActivity.java
@@ -2,38 +2,23 @@
 
 import android.Manifest;
 import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.graphics.Insets;
-import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import android.provider.Settings;
-import android.support.v4.view.OnApplyWindowInsetsListener;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.WindowCompat;
-import android.support.v4.view.WindowInsetsCompat;
-import android.support.v7.preference.PreferenceManager;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.Window;
-import android.view.WindowInsets;
 import android.view.WindowManager;
 import android.widget.PopupWindow;
 import android.widget.Toast;
@@ -51,11 +36,9 @@
 import uk.openvk.android.legacy.OvkApplication;
 import uk.openvk.android.legacy.R;
 import uk.openvk.android.legacy.api.enumerations.HandlerMessages;
-import uk.openvk.android.legacy.api.wrappers.DownloadManager;
 import uk.openvk.android.legacy.ui.core.activities.base.NetworkActivity;
-import uk.openvk.android.legacy.ui.core.activities.base.TranslucentActivity;
-import uk.openvk.android.legacy.ui.view.layouts.ProgressLayout;
-import uk.openvk.android.legacy.ui.view.layouts.ZoomableImageView;
+import uk.openvk.android.legacy.ui.views.ProgressLayout;
+import uk.openvk.android.legacy.ui.views.base.ZoomableImageView;
 import uk.openvk.android.legacy.ui.wrappers.LocaleContextWrapper;
 
 /** Copyleft © 2022, 2023 OpenVK Team

diff --git a/app/src/main/java/uk/openvk/android/legacy/ui/core/activities/QuickSearchActivity.java b/app/src/main/java/uk/openvk/android/legacy/ui/core/activities/QuickSearchActivity.java
@@ -1,15 +1,11 @@
 package uk.openvk.android.legacy.ui.core.activities;
 
-import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Message;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -24,23 +20,13 @@
 
 import java.util.Locale;
 
-import dev.tinelix.retro_ab.ActionBar;
-import uk.openvk.android.legacy.BuildConfig;
-import uk.openvk.android.legacy.Global;
 import uk.openvk.android.legacy.OvkApplication;
 import uk.openvk.android.legacy.R;
-import uk.openvk.android.legacy.api.OpenVKAPI;
-import uk.openvk.android.legacy.api.interfaces.OvkAPIListeners;
-import uk.openvk.android.legacy.api.models.Groups;
-import uk.openvk.android.legacy.api.models.Users;
 import uk.openvk.android.legacy.api.enumerations.HandlerMessages;
 import uk.openvk.android.legacy.api.wrappers.DownloadManager;
-import uk.openvk.android.legacy.api.wrappers.OvkAPIWrapper;
 import uk.openvk.android.legacy.ui.core.activities.base.NetworkActivity;
-import uk.openvk.android.legacy.ui.core.activities.base.TranslucentActivity;
-import uk.openvk.android.legacy.ui.view.layouts.FullListView;
-import uk.openvk.android.legacy.ui.view.layouts.PollAttachView;
-import uk.openvk.android.legacy.ui.view.layouts.SearchResultsLayout;
+import uk.openvk.android.legacy.ui.views.base.FullListView;
+import uk.openvk.android.legacy.ui.views.SearchResultsLayout;
 import uk.openvk.android.legacy.ui.wrappers.LocaleContextWrapper;
 
 /** Copyleft © 2022, 2023 OpenVK Team

diff --git a/app/src/main/java/uk/openvk/android/legacy/ui/core/activities/WallPostActivity.java b/app/src/main/java/uk/openvk/android/legacy/ui/core/activities/WallPostActivity.java
@@ -47,11 +47,11 @@
 import uk.openvk.android.legacy.api.entities.Comment;
 import uk.openvk.android.legacy.ui.core.activities.base.NetworkFragmentActivity;
 import uk.openvk.android.legacy.ui.core.listeners.OnKeyboardStateListener;
-import uk.openvk.android.legacy.ui.view.layouts.CommentPanel;
-import uk.openvk.android.legacy.ui.view.layouts.PostViewLayout;
+import uk.openvk.android.legacy.ui.views.CommentPanel;
+import uk.openvk.android.legacy.ui.views.PostViewLayout;
 import uk.openvk.android.legacy.ui.list.adapters.CommentsListAdapter;
 import uk.openvk.android.legacy.api.entities.WallPost;
-import uk.openvk.android.legacy.ui.view.layouts.XLinearLayout;
+import uk.openvk.android.legacy.ui.views.base.XLinearLayout;
 import uk.openvk.android.legacy.ui.wrappers.LocaleContextWrapper;
 
 /** Copyleft © 2022, 2023 OpenVK Team

diff --git a/app/src/main/java/uk/openvk/android/legacy/ui/core/activities/base/UsersListActivity.java b/app/src/main/java/uk/openvk/android/legacy/ui/core/activities/base/UsersListActivity.java
@@ -15,8 +15,8 @@
 import uk.openvk.android.legacy.R;
 import uk.openvk.android.legacy.api.entities.User;
 import uk.openvk.android.legacy.ui.core.fragments.base.UsersFragment;
-import uk.openvk.android.legacy.ui.view.layouts.ErrorLayout;
-import uk.openvk.android.legacy.ui.view.layouts.ProgressLayout;
+import uk.openvk.android.legacy.ui.views.ErrorLayout;
+import uk.openvk.android.legacy.ui.views.ProgressLayout;
 
 /**
  * OPENVK LEGACY LICENSE NOTIFICATION

diff --git a/.../main/java/uk/openvk/android/legacy/ui/core/activities/intents/FriendsIntentActivity.java b/.../main/java/uk/openvk/android/legacy/ui/core/activities/intents/FriendsIntentActivity.java
@@ -24,10 +24,9 @@
 import uk.openvk.android.legacy.api.enumerations.HandlerMessages;
 import uk.openvk.android.legacy.api.entities.Friend;
 import uk.openvk.android.legacy.ui.core.activities.base.NetworkFragmentActivity;
-import uk.openvk.android.legacy.ui.view.layouts.ErrorLayout;
+import uk.openvk.android.legacy.ui.views.ErrorLayout;
 import uk.openvk.android.legacy.ui.core.fragments.app.FriendsFragment;
-import uk.openvk.android.legacy.ui.view.layouts.ProgressLayout;
-import uk.openvk.android.legacy.ui.view.layouts.TabSelector;
+import uk.openvk.android.legacy.ui.views.ProgressLayout;
 import uk.openvk.android.legacy.ui.list.items.SlidingMenuItem;
 import uk.openvk.android.legacy.ui.wrappers.LocaleContextWrapper;
 

diff --git a/...rc/main/java/uk/openvk/android/legacy/ui/core/activities/intents/GroupIntentActivity.java b/...rc/main/java/uk/openvk/android/legacy/ui/core/activities/intents/GroupIntentActivity.java
@@ -44,16 +44,16 @@
 import uk.openvk.android.legacy.ui.core.activities.NewPostActivity;
 import uk.openvk.android.legacy.ui.core.activities.base.NetworkFragmentActivity;
 import uk.openvk.android.legacy.ui.core.listeners.OnScrollListener;
-import uk.openvk.android.legacy.ui.view.InfinityNestedScrollView;
-import uk.openvk.android.legacy.ui.view.InfinityScrollView;
-import uk.openvk.android.legacy.ui.view.layouts.AboutGroupLayout;
-import uk.openvk.android.legacy.ui.view.layouts.ErrorLayout;
-import uk.openvk.android.legacy.ui.view.layouts.GroupHeader;
-import uk.openvk.android.legacy.ui.view.layouts.ProfileCounterLayout;
-import uk.openvk.android.legacy.ui.view.layouts.ProfileWallSelector;
-import uk.openvk.android.legacy.ui.view.layouts.ProgressLayout;
-import uk.openvk.android.legacy.ui.view.layouts.WallErrorLayout;
-import uk.openvk.android.legacy.ui.view.layouts.WallLayout;
+import uk.openvk.android.legacy.ui.views.base.InfinityNestedScrollView;
+import uk.openvk.android.legacy.ui.views.base.InfinityScrollView;
+import uk.openvk.android.legacy.ui.views.AboutGroupLayout;
+import uk.openvk.android.legacy.ui.views.ErrorLayout;
+import uk.openvk.android.legacy.ui.views.GroupHeader;
+import uk.openvk.android.legacy.ui.views.ProfileCounterLayout;
+import uk.openvk.android.legacy.ui.views.ProfileWallSelector;
+import uk.openvk.android.legacy.ui.views.ProgressLayout;
+import uk.openvk.android.legacy.ui.views.WallErrorLayout;
+import uk.openvk.android.legacy.ui.views.WallLayout;
 import uk.openvk.android.legacy.api.entities.WallPost;
 import uk.openvk.android.legacy.ui.wrappers.LocaleContextWrapper;
 

diff --git a/...rc/main/java/uk/openvk/android/legacy/ui/core/activities/intents/NotesIntentActivity.java b/...rc/main/java/uk/openvk/android/legacy/ui/core/activities/intents/NotesIntentActivity.java
@@ -32,8 +32,8 @@
 import uk.openvk.android.legacy.ui.core.activities.base.TranslucentFragmentActivity;
 import uk.openvk.android.legacy.ui.core.fragments.app.NotesFragment;
 import uk.openvk.android.legacy.ui.list.items.SlidingMenuItem;
-import uk.openvk.android.legacy.ui.view.layouts.ErrorLayout;
-import uk.openvk.android.legacy.ui.view.layouts.ProgressLayout;
+import uk.openvk.android.legacy.ui.views.ErrorLayout;
+import uk.openvk.android.legacy.ui.views.ProgressLayout;
 import uk.openvk.android.legacy.ui.wrappers.LocaleContextWrapper;
 
 /** Copyleft © 2022, 2023 OpenVK Team

diff --git a/...in/java/uk/openvk/android/legacy/ui/core/activities/intents/PhotoAlbumIntentActivity.java b/...in/java/uk/openvk/android/legacy/ui/core/activities/intents/PhotoAlbumIntentActivity.java
@@ -1,8 +1,6 @@
 package uk.openvk.android.legacy.ui.core.activities.intents;
 
-import android.app.ActionBar;
 import android.content.res.Configuration;
-import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Build;
@@ -27,7 +25,7 @@
 import uk.openvk.android.legacy.api.enumerations.HandlerMessages;
 import uk.openvk.android.legacy.ui.core.activities.base.NetworkActivity;
 import uk.openvk.android.legacy.ui.list.adapters.PhotosListAdapter;
-import uk.openvk.android.legacy.ui.view.layouts.ProgressLayout;
+import uk.openvk.android.legacy.ui.views.ProgressLayout;
 import uk.openvk.android.legacy.ui.utils.FlexibleGridLayoutManager;
 
 /** Copyleft © 2022, 2023 OpenVK Team

diff --git a/.../main/java/uk/openvk/android/legacy/ui/core/activities/intents/ProfileIntentActivity.java b/.../main/java/uk/openvk/android/legacy/ui/core/activities/intents/ProfileIntentActivity.java
@@ -33,10 +33,10 @@
 import uk.openvk.android.legacy.api.wrappers.JSONParser;
 import uk.openvk.android.legacy.ui.core.activities.base.NetworkFragmentActivity;
 import uk.openvk.android.legacy.ui.core.fragments.app.ProfileFragment;
-import uk.openvk.android.legacy.ui.view.layouts.ErrorLayout;
-import uk.openvk.android.legacy.ui.view.layouts.ProfileHeader;
-import uk.openvk.android.legacy.ui.view.layouts.ProgressLayout;
-import uk.openvk.android.legacy.ui.view.layouts.WallLayout;
+import uk.openvk.android.legacy.ui.views.ErrorLayout;
+import uk.openvk.android.legacy.ui.views.ProfileHeader;
+import uk.openvk.android.legacy.ui.views.ProgressLayout;
+import uk.openvk.android.legacy.ui.views.WallLayout;
 import uk.openvk.android.legacy.ui.wrappers.LocaleContextWrapper;
 
 /** Copyleft © 2022, 2023 OpenVK Team

diff --git a/app/src/main/java/uk/openvk/android/legacy/ui/core/fragments/app/FriendsFragment.java b/app/src/main/java/uk/openvk/android/legacy/ui/core/fragments/app/FriendsFragment.java
@@ -31,8 +31,8 @@
 import uk.openvk.android.legacy.ui.list.adapters.FriendsRequestsAdapter;
 import uk.openvk.android.legacy.ui.utils.WrappedGridLayoutManager;
 import uk.openvk.android.legacy.ui.utils.WrappedLinearLayoutManager;
-import uk.openvk.android.legacy.ui.view.InfinityRecyclerView;
-import uk.openvk.android.legacy.ui.view.layouts.TabSelector;
+import uk.openvk.android.legacy.ui.views.base.InfinityRecyclerView;
+import uk.openvk.android.legacy.ui.views.TabSelector;
 
 /** Copyleft © 2022, 2023 OpenVK Team
  *  Copyleft © 2022, 2023 Dmitry Tretyakov (aka. Tinelix)