From 705c7c2ec06c6414828961bad90c3d478b780c71 Mon Sep 17 00:00:00 2001 From: adiaholic Date: Fri, 13 Sep 2019 12:47:59 +0530 Subject: [PATCH] Remove Checkstyle Errors By : 1) Rearrange imports 2) Adding `package-info` where required --- .../messenger/MercuryImApplication.java | 2 -- .../messenger/di/component/AppComponent.java | 4 ++-- .../messenger/di/module/AppModule.java | 6 +++--- .../messenger/service/package-info.java | 4 ++++ .../mercury_im/messenger/ui/MainActivity.java | 6 +++--- .../messenger/ui/chat/ChatActivity.java | 21 +++++++++++-------- .../messenger/ui/chat/ChatInputFragment.java | 16 +++++++------- .../ui/chat/ChatRecyclerViewAdapter.java | 1 - .../messenger/ui/chat/ChatViewModel.java | 13 ++++++------ .../messenger/ui/chat/package-info.java | 4 ++++ .../ui/chatlist/ChatListFragment.java | 6 +++--- .../chatlist/ChatListRecyclerViewAdapter.java | 10 ++++----- .../ui/chatlist/ChatListViewModel.java | 21 +++++++++---------- .../messenger/ui/chatlist/package-info.java | 4 ++++ .../messenger/ui/login/AccountsActivity.java | 4 ++-- .../ui/login/AccountsRecyclerViewAdapter.java | 4 ++-- .../messenger/ui/login/AccountsViewModel.java | 10 ++++----- .../messenger/ui/login/LoginActivity.java | 6 +++--- .../messenger/ui/login/LoginViewModel.java | 15 +++++++------ .../messenger/ui/login/package-info.java | 4 ++++ .../mercury_im/messenger/ui/package-info.java | 4 ++++ .../messenger/ui/roster/RosterFragment.java | 8 +++---- .../ui/roster/RosterRecyclerViewAdapter.java | 16 +++++--------- .../messenger/ui/roster/RosterViewModel.java | 9 ++++---- .../messenger/ui/roster/package-info.java | 4 ++++ .../settings/AppCompatPreferenceActivity.java | 7 ++++--- .../ui/settings/SettingsActivity.java | 3 ++- .../messenger/ui/settings/package-info.java | 4 ++++ .../ui/util/AbstractRecyclerViewAdapter.java | 2 +- .../messenger/ui/util/package-info.java | 4 ++++ .../mercury_im/messenger/util/ColorUtil.java | 2 +- .../messenger/util/package-info.java | 4 ++++ 32 files changed, 127 insertions(+), 101 deletions(-) create mode 100644 app/src/main/java/org/mercury_im/messenger/service/package-info.java create mode 100644 app/src/main/java/org/mercury_im/messenger/ui/chat/package-info.java create mode 100644 app/src/main/java/org/mercury_im/messenger/ui/chatlist/package-info.java create mode 100644 app/src/main/java/org/mercury_im/messenger/ui/login/package-info.java create mode 100644 app/src/main/java/org/mercury_im/messenger/ui/package-info.java create mode 100644 app/src/main/java/org/mercury_im/messenger/ui/roster/package-info.java create mode 100644 app/src/main/java/org/mercury_im/messenger/ui/settings/package-info.java create mode 100644 app/src/main/java/org/mercury_im/messenger/ui/util/package-info.java create mode 100644 app/src/main/java/org/mercury_im/messenger/util/package-info.java diff --git a/app/src/main/java/org/mercury_im/messenger/MercuryImApplication.java b/app/src/main/java/org/mercury_im/messenger/MercuryImApplication.java index 5c8bcaa..3371907 100644 --- a/app/src/main/java/org/mercury_im/messenger/MercuryImApplication.java +++ b/app/src/main/java/org/mercury_im/messenger/MercuryImApplication.java @@ -7,9 +7,7 @@ import android.app.NotificationManager; import android.content.Context; import android.content.Intent; import android.os.Build; -import android.os.Bundle; -import org.jivesoftware.smackx.csi.ClientStateIndicationManager; import org.mercury_im.messenger.core.centers.ConnectionCenter; import org.mercury_im.messenger.core.connection.MercuryConfiguration; import org.mercury_im.messenger.di.component.AppComponent; diff --git a/app/src/main/java/org/mercury_im/messenger/di/component/AppComponent.java b/app/src/main/java/org/mercury_im/messenger/di/component/AppComponent.java index 46188c6..19b66ed 100644 --- a/app/src/main/java/org/mercury_im/messenger/di/component/AppComponent.java +++ b/app/src/main/java/org/mercury_im/messenger/di/component/AppComponent.java @@ -1,5 +1,7 @@ package org.mercury_im.messenger.di.component; +import dagger.Component; + import org.mercury_im.messenger.MercuryImApplication; import org.mercury_im.messenger.core.stores.PlainMessageStore; import org.mercury_im.messenger.di.module.AppModule; @@ -19,8 +21,6 @@ import org.mercury_im.messenger.ui.roster.RosterViewModel; import javax.inject.Singleton; -import dagger.Component; - /** * Main Application Component that binds together all the modules needed for the Android * application. diff --git a/app/src/main/java/org/mercury_im/messenger/di/module/AppModule.java b/app/src/main/java/org/mercury_im/messenger/di/module/AppModule.java index 428c621..8fc2d95 100644 --- a/app/src/main/java/org/mercury_im/messenger/di/module/AppModule.java +++ b/app/src/main/java/org/mercury_im/messenger/di/module/AppModule.java @@ -2,14 +2,14 @@ package org.mercury_im.messenger.di.module; import android.app.Application; +import dagger.Module; +import dagger.Provides; + import org.mercury_im.messenger.MercuryImApplication; import org.mercury_im.messenger.core.di.CenterModule; import javax.inject.Singleton; -import dagger.Module; -import dagger.Provides; - @Module(includes = CenterModule.class) public class AppModule { diff --git a/app/src/main/java/org/mercury_im/messenger/service/package-info.java b/app/src/main/java/org/mercury_im/messenger/service/package-info.java new file mode 100644 index 0000000..6bb833a --- /dev/null +++ b/app/src/main/java/org/mercury_im/messenger/service/package-info.java @@ -0,0 +1,4 @@ +/** + * Some Javadoc information about the package. + */ +package org.mercury_im.messenger.service; diff --git a/app/src/main/java/org/mercury_im/messenger/ui/MainActivity.java b/app/src/main/java/org/mercury_im/messenger/ui/MainActivity.java index 505700b..994cde4 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/MainActivity.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/MainActivity.java @@ -10,6 +10,9 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.FragmentTransaction; +import butterknife.BindView; +import butterknife.ButterKnife; + import com.google.android.material.bottomnavigation.BottomNavigationView; import com.google.android.material.navigation.NavigationView; @@ -26,9 +29,6 @@ import org.mercury_im.messenger.ui.settings.SettingsActivity; import javax.inject.Inject; -import butterknife.BindView; -import butterknife.ButterKnife; - public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener, AccountsFragment.OnAccountListItemClickListener { diff --git a/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatActivity.java b/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatActivity.java index 8f7075d..ae59d93 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatActivity.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatActivity.java @@ -14,23 +14,26 @@ import androidx.lifecycle.ViewModelProviders; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import butterknife.BindView; +import butterknife.ButterKnife; + +import io.reactivex.disposables.CompositeDisposable; +import io.reactivex.schedulers.Schedulers; + import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.chat2.ChatManager; import org.jxmpp.jid.EntityBareJid; import org.jxmpp.jid.impl.JidCreate; + import org.mercury_im.messenger.MercuryImApplication; import org.mercury_im.messenger.R; import org.mercury_im.messenger.core.centers.ConnectionCenter; import org.mercury_im.messenger.persistence.repository.ChatRepository; -import javax.inject.Inject; +import java.util.logging.Level; +import java.util.logging.Logger; -import butterknife.BindView; -import butterknife.ButterKnife; -import io.reactivex.Scheduler; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.CompositeDisposable; -import io.reactivex.schedulers.Schedulers; +import javax.inject.Inject; public class ChatActivity extends AppCompatActivity implements ChatInputFragment.OnChatInputActionListener, SearchView.OnQueryTextListener { @@ -192,9 +195,9 @@ public class ChatActivity extends AppCompatActivity ChatManager.getInstanceFor(connectionCenter.getConnection(accountId).getConnection()) .chatWith(jid).send(msg); } catch (SmackException.NotConnectedException e) { - e.printStackTrace(); + Logger.getAnonymousLogger().log(Level.SEVERE,"NotConnectedException : \n" + e.getStackTrace().toString()); } catch (InterruptedException e) { - e.printStackTrace(); + Logger.getAnonymousLogger().log(Level.SEVERE,"InterruptedException" + e.getStackTrace().toString()); } } }.start(); diff --git a/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatInputFragment.java b/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatInputFragment.java index cc233e4..9a02bff 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatInputFragment.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatInputFragment.java @@ -1,28 +1,26 @@ package org.mercury_im.messenger.ui.chat; -import androidx.lifecycle.ViewModelProviders; +import static org.mercury_im.messenger.MercuryImApplication.TAG; import android.content.Context; import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.fragment.app.Fragment; - import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.EditText; import android.widget.ImageButton; -import android.widget.Toast; -import org.mercury_im.messenger.R; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.lifecycle.ViewModelProviders; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; -import static org.mercury_im.messenger.MercuryImApplication.TAG; +import org.mercury_im.messenger.R; public class ChatInputFragment extends Fragment implements View.OnClickListener { @@ -69,7 +67,7 @@ public class ChatInputFragment extends Fragment implements View.OnClickListener * @param viewModel ViewModel */ private void observeViewModel(ChatInputViewModel viewModel) { - //viewModel.getDraft().observe(ChatInputFragment.this, draft -> textInput.setText(draft)); + // viewModel.getDraft().observe(ChatInputFragment.this, draft -> textInput.setText(draft)); } /** diff --git a/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatRecyclerViewAdapter.java b/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatRecyclerViewAdapter.java index 15467a7..fbd17a8 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatRecyclerViewAdapter.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatRecyclerViewAdapter.java @@ -1,6 +1,5 @@ package org.mercury_im.messenger.ui.chat; -import android.text.util.Linkify; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatViewModel.java b/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatViewModel.java index bd1459d..f3c8ec8 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatViewModel.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatViewModel.java @@ -4,6 +4,12 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; +import io.reactivex.Completable; +import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.disposables.CompositeDisposable; +import io.reactivex.functions.Consumer; +import io.reactivex.schedulers.Schedulers; + import org.jxmpp.jid.EntityBareJid; import org.mercury_im.messenger.MercuryImApplication; import org.mercury_im.messenger.core.centers.ConnectionCenter; @@ -19,13 +25,6 @@ import java.util.List; import javax.inject.Inject; -import io.reactivex.Completable; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.CompositeDisposable; -import io.reactivex.functions.Action; -import io.reactivex.functions.Consumer; -import io.reactivex.schedulers.Schedulers; - public class ChatViewModel extends ViewModel { private final CompositeDisposable disposable = new CompositeDisposable(); diff --git a/app/src/main/java/org/mercury_im/messenger/ui/chat/package-info.java b/app/src/main/java/org/mercury_im/messenger/ui/chat/package-info.java new file mode 100644 index 0000000..38fc930 --- /dev/null +++ b/app/src/main/java/org/mercury_im/messenger/ui/chat/package-info.java @@ -0,0 +1,4 @@ +/** + * Some Javadoc information about the package. + */ +package org.mercury_im.messenger.ui.chat; diff --git a/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListFragment.java b/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListFragment.java index ec1384d..865daec 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListFragment.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListFragment.java @@ -1,5 +1,7 @@ package org.mercury_im.messenger.ui.chatlist; +import static org.mercury_im.messenger.MercuryImApplication.TAG; + import android.content.Context; import android.os.Bundle; import android.util.Log; @@ -13,12 +15,10 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProviders; import androidx.recyclerview.widget.RecyclerView; -import org.mercury_im.messenger.R; - import butterknife.BindView; import butterknife.ButterKnife; -import static org.mercury_im.messenger.MercuryImApplication.TAG; +import org.mercury_im.messenger.R; public class ChatListFragment extends Fragment { diff --git a/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListRecyclerViewAdapter.java b/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListRecyclerViewAdapter.java index 7d59751..698bb07 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListRecyclerViewAdapter.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListRecyclerViewAdapter.java @@ -8,14 +8,14 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import org.mercury_im.messenger.R; -import org.mercury_im.messenger.persistence.pojo.Chat; -import org.mercury_im.messenger.ui.util.AbstractRecyclerViewAdapter; - import butterknife.BindView; import butterknife.ButterKnife; import de.hdodenhof.circleimageview.CircleImageView; +import org.mercury_im.messenger.R; +import org.mercury_im.messenger.persistence.pojo.Chat; +import org.mercury_im.messenger.ui.util.AbstractRecyclerViewAdapter; + public class ChatListRecyclerViewAdapter extends AbstractRecyclerViewAdapter { @@ -60,7 +60,7 @@ public class ChatListRecyclerViewAdapter private static class ChatMessageDiffCallback extends AbstractDiffCallback { - public ChatMessageDiffCallback(boolean detectMoves) { + ChatMessageDiffCallback(boolean detectMoves) { super(detectMoves); } diff --git a/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListViewModel.java b/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListViewModel.java index 2ded6ce..8d9157c 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListViewModel.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListViewModel.java @@ -4,22 +4,21 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; -import org.mercury_im.messenger.MercuryImApplication; -import org.mercury_im.messenger.persistence.model.ChatModel; -import org.mercury_im.messenger.persistence.model.MessageModel; -import org.mercury_im.messenger.persistence.repository.ChatRepository; -import org.mercury_im.messenger.persistence.repository.MessageRepository; -import org.mercury_im.messenger.persistence.pojo.Chat; - -import java.util.List; - -import javax.inject.Inject; - import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.CompositeDisposable; import io.reactivex.functions.Consumer; import io.reactivex.schedulers.Schedulers; +import org.mercury_im.messenger.MercuryImApplication; +import org.mercury_im.messenger.persistence.model.MessageModel; +import org.mercury_im.messenger.persistence.pojo.Chat; +import org.mercury_im.messenger.persistence.repository.ChatRepository; +import org.mercury_im.messenger.persistence.repository.MessageRepository; + +import java.util.List; + +import javax.inject.Inject; + public class ChatListViewModel extends ViewModel { @Inject diff --git a/app/src/main/java/org/mercury_im/messenger/ui/chatlist/package-info.java b/app/src/main/java/org/mercury_im/messenger/ui/chatlist/package-info.java new file mode 100644 index 0000000..eaecd2e --- /dev/null +++ b/app/src/main/java/org/mercury_im/messenger/ui/chatlist/package-info.java @@ -0,0 +1,4 @@ +/** + * Some Javadoc information about the package. + */ +package org.mercury_im.messenger.ui.chatlist; diff --git a/app/src/main/java/org/mercury_im/messenger/ui/login/AccountsActivity.java b/app/src/main/java/org/mercury_im/messenger/ui/login/AccountsActivity.java index 0352d67..0339a26 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/login/AccountsActivity.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/login/AccountsActivity.java @@ -8,6 +8,8 @@ import android.view.View; import androidx.appcompat.app.AppCompatActivity; +import io.reactivex.schedulers.Schedulers; + import org.mercury_im.messenger.MercuryImApplication; import org.mercury_im.messenger.R; import org.mercury_im.messenger.persistence.model.AccountModel; @@ -15,8 +17,6 @@ import org.mercury_im.messenger.persistence.repository.AccountRepository; import javax.inject.Inject; -import io.reactivex.schedulers.Schedulers; - public class AccountsActivity extends AppCompatActivity implements AccountsFragment.OnAccountListItemClickListener { diff --git a/app/src/main/java/org/mercury_im/messenger/ui/login/AccountsRecyclerViewAdapter.java b/app/src/main/java/org/mercury_im/messenger/ui/login/AccountsRecyclerViewAdapter.java index deb39ee..c9a6237 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/login/AccountsRecyclerViewAdapter.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/login/AccountsRecyclerViewAdapter.java @@ -10,6 +10,8 @@ import android.widget.TextView; import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.RecyclerView; +import de.hdodenhof.circleimageview.CircleImageView; + import org.mercury_im.messenger.MercuryImApplication; import org.mercury_im.messenger.R; import org.mercury_im.messenger.persistence.model.AccountModel; @@ -19,8 +21,6 @@ import org.mercury_im.messenger.util.AbstractDiffCallback; import java.util.ArrayList; import java.util.List; -import de.hdodenhof.circleimageview.CircleImageView; - public class AccountsRecyclerViewAdapter extends RecyclerView.Adapter { private final List mValues; diff --git a/app/src/main/java/org/mercury_im/messenger/ui/login/AccountsViewModel.java b/app/src/main/java/org/mercury_im/messenger/ui/login/AccountsViewModel.java index 2fca743..2384c36 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/login/AccountsViewModel.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/login/AccountsViewModel.java @@ -4,6 +4,11 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; +import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.disposables.CompositeDisposable; +import io.reactivex.functions.Consumer; +import io.reactivex.schedulers.Schedulers; + import org.mercury_im.messenger.MercuryImApplication; import org.mercury_im.messenger.core.centers.ConnectionCenter; import org.mercury_im.messenger.persistence.model.AccountModel; @@ -13,11 +18,6 @@ import java.util.List; import javax.inject.Inject; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.CompositeDisposable; -import io.reactivex.functions.Consumer; -import io.reactivex.schedulers.Schedulers; - public class AccountsViewModel extends ViewModel { @Inject diff --git a/app/src/main/java/org/mercury_im/messenger/ui/login/LoginActivity.java b/app/src/main/java/org/mercury_im/messenger/ui/login/LoginActivity.java index 519cc0f..756fc0e 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/login/LoginActivity.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/login/LoginActivity.java @@ -9,9 +9,11 @@ import android.widget.TextView; import androidx.appcompat.app.AppCompatActivity; import androidx.lifecycle.LiveData; -import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProviders; +import butterknife.BindView; +import butterknife.ButterKnife; + import com.google.android.material.textfield.TextInputEditText; import org.mercury_im.messenger.MercuryImApplication; @@ -19,8 +21,6 @@ import org.mercury_im.messenger.R; import org.mercury_im.messenger.persistence.model.AccountModel; import org.mercury_im.messenger.util.TextChangedListener; -import butterknife.BindView; -import butterknife.ButterKnife; /** * A login screen that offers login via email/password. diff --git a/app/src/main/java/org/mercury_im/messenger/ui/login/LoginViewModel.java b/app/src/main/java/org/mercury_im/messenger/ui/login/LoginViewModel.java index c479fd9..57faa69 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/login/LoginViewModel.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/login/LoginViewModel.java @@ -1,5 +1,7 @@ package org.mercury_im.messenger.ui.login; +import static org.mercury_im.messenger.core.connection.MercuryConnection.TAG; + import android.text.TextUtils; import android.util.Log; @@ -8,6 +10,11 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; +import io.reactivex.Single; +import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.observers.DisposableSingleObserver; +import io.reactivex.schedulers.Schedulers; + import org.jxmpp.jid.EntityBareJid; import org.jxmpp.jid.impl.JidCreate; import org.mercury_im.messenger.MercuryImApplication; @@ -18,14 +25,6 @@ import org.mercury_im.messenger.persistence.room.model.RoomAccountModel; import javax.inject.Inject; -import io.reactivex.Single; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.observers.DisposableSingleObserver; -import io.reactivex.schedulers.Schedulers; - -import static org.mercury_im.messenger.core.connection.MercuryConnection.TAG; - - public class LoginViewModel extends ViewModel { @Inject diff --git a/app/src/main/java/org/mercury_im/messenger/ui/login/package-info.java b/app/src/main/java/org/mercury_im/messenger/ui/login/package-info.java new file mode 100644 index 0000000..39d6812 --- /dev/null +++ b/app/src/main/java/org/mercury_im/messenger/ui/login/package-info.java @@ -0,0 +1,4 @@ +/** + * Some Javadoc information about the package. + */ +package org.mercury_im.messenger.ui.login; diff --git a/app/src/main/java/org/mercury_im/messenger/ui/package-info.java b/app/src/main/java/org/mercury_im/messenger/ui/package-info.java new file mode 100644 index 0000000..8c4f7b2 --- /dev/null +++ b/app/src/main/java/org/mercury_im/messenger/ui/package-info.java @@ -0,0 +1,4 @@ +/** + * Some Javadoc information about the package. + */ +package org.mercury_im.messenger.ui; diff --git a/app/src/main/java/org/mercury_im/messenger/ui/roster/RosterFragment.java b/app/src/main/java/org/mercury_im/messenger/ui/roster/RosterFragment.java index 1d56fbf..92d3857 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/roster/RosterFragment.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/roster/RosterFragment.java @@ -1,5 +1,7 @@ package org.mercury_im.messenger.ui.roster; +import static androidx.constraintlayout.widget.Constraints.TAG; + import android.content.Context; import android.os.Bundle; import android.util.Log; @@ -11,14 +13,10 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProviders; import androidx.recyclerview.widget.RecyclerView; -import org.mercury_im.messenger.R; - -import java.util.ArrayList; - import butterknife.BindView; import butterknife.ButterKnife; -import static androidx.constraintlayout.widget.Constraints.TAG; +import org.mercury_im.messenger.R; /** * A placeholder fragment containing a simple view. diff --git a/app/src/main/java/org/mercury_im/messenger/ui/roster/RosterRecyclerViewAdapter.java b/app/src/main/java/org/mercury_im/messenger/ui/roster/RosterRecyclerViewAdapter.java index f093f3d..5d6e953 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/roster/RosterRecyclerViewAdapter.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/roster/RosterRecyclerViewAdapter.java @@ -2,34 +2,28 @@ package org.mercury_im.messenger.ui.roster; import android.content.Context; import android.content.Intent; -import android.os.Build; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; import androidx.annotation.NonNull; -import androidx.appcompat.app.AppCompatActivity; -import androidx.core.app.ActivityOptionsCompat; import androidx.recyclerview.widget.RecyclerView; +import butterknife.BindView; +import butterknife.ButterKnife; +import de.hdodenhof.circleimageview.CircleImageView; + import org.jivesoftware.smackx.colors.ConsistentColor; import org.jxmpp.jid.EntityBareJid; import org.mercury_im.messenger.R; -import org.mercury_im.messenger.persistence.model.ContactModel; import org.mercury_im.messenger.persistence.room.model.RoomContactModel; import org.mercury_im.messenger.ui.chat.ChatActivity; import org.mercury_im.messenger.ui.util.AbstractRecyclerViewAdapter; import org.mercury_im.messenger.util.ColorUtil; -import java.util.ArrayList; -import java.util.List; import java.util.Objects; -import butterknife.BindView; -import butterknife.ButterKnife; -import de.hdodenhof.circleimageview.CircleImageView; - public class RosterRecyclerViewAdapter extends AbstractRecyclerViewAdapter { @@ -91,7 +85,7 @@ public class RosterRecyclerViewAdapter private static class ContactDiffCallback extends AbstractDiffCallback { - public ContactDiffCallback() { + ContactDiffCallback() { super(true); } diff --git a/app/src/main/java/org/mercury_im/messenger/ui/roster/RosterViewModel.java b/app/src/main/java/org/mercury_im/messenger/ui/roster/RosterViewModel.java index c5608d3..e1702f0 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/roster/RosterViewModel.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/roster/RosterViewModel.java @@ -6,6 +6,11 @@ import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; +import io.reactivex.android.schedulers.AndroidSchedulers; +import io.reactivex.disposables.CompositeDisposable; +import io.reactivex.functions.Consumer; +import io.reactivex.schedulers.Schedulers; + import org.mercury_im.messenger.MercuryImApplication; import org.mercury_im.messenger.persistence.model.ContactModel; import org.mercury_im.messenger.persistence.repository.RosterRepository; @@ -15,10 +20,6 @@ import java.util.List; import javax.inject.Inject; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.CompositeDisposable; -import io.reactivex.functions.Consumer; -import io.reactivex.schedulers.Schedulers; public class RosterViewModel extends ViewModel { diff --git a/app/src/main/java/org/mercury_im/messenger/ui/roster/package-info.java b/app/src/main/java/org/mercury_im/messenger/ui/roster/package-info.java new file mode 100644 index 0000000..62d19ba --- /dev/null +++ b/app/src/main/java/org/mercury_im/messenger/ui/roster/package-info.java @@ -0,0 +1,4 @@ +/** + * Some Javadoc information about the package. + */ +package org.mercury_im.messenger.ui.roster; diff --git a/app/src/main/java/org/mercury_im/messenger/ui/settings/AppCompatPreferenceActivity.java b/app/src/main/java/org/mercury_im/messenger/ui/settings/AppCompatPreferenceActivity.java index ea56bc2..264543a 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/settings/AppCompatPreferenceActivity.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/settings/AppCompatPreferenceActivity.java @@ -3,14 +3,15 @@ package org.mercury_im.messenger.ui.settings; import android.content.res.Configuration; import android.os.Bundle; import android.preference.PreferenceActivity; +import android.view.MenuInflater; +import android.view.View; +import android.view.ViewGroup; + import androidx.annotation.LayoutRes; import androidx.annotation.Nullable; import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatDelegate; import androidx.appcompat.widget.Toolbar; -import android.view.MenuInflater; -import android.view.View; -import android.view.ViewGroup; /** * A {@link android.preference.PreferenceActivity} which implements and proxies the necessary calls diff --git a/app/src/main/java/org/mercury_im/messenger/ui/settings/SettingsActivity.java b/app/src/main/java/org/mercury_im/messenger/ui/settings/SettingsActivity.java index 8805b3a..0ea25a9 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/settings/SettingsActivity.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/settings/SettingsActivity.java @@ -12,13 +12,14 @@ import android.os.Bundle; import android.preference.ListPreference; import android.preference.Preference; import android.preference.PreferenceActivity; -import androidx.appcompat.app.ActionBar; import android.preference.PreferenceFragment; import android.preference.PreferenceManager; import android.preference.RingtonePreference; import android.text.TextUtils; import android.view.MenuItem; +import androidx.appcompat.app.ActionBar; + import org.mercury_im.messenger.R; import java.util.List; diff --git a/app/src/main/java/org/mercury_im/messenger/ui/settings/package-info.java b/app/src/main/java/org/mercury_im/messenger/ui/settings/package-info.java new file mode 100644 index 0000000..5ab3dde --- /dev/null +++ b/app/src/main/java/org/mercury_im/messenger/ui/settings/package-info.java @@ -0,0 +1,4 @@ +/** + * Some Javadoc information about the package. + */ +package org.mercury_im.messenger.ui.settings; diff --git a/app/src/main/java/org/mercury_im/messenger/ui/util/AbstractRecyclerViewAdapter.java b/app/src/main/java/org/mercury_im/messenger/ui/util/AbstractRecyclerViewAdapter.java index deceabb..2b23247 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/util/AbstractRecyclerViewAdapter.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/util/AbstractRecyclerViewAdapter.java @@ -36,7 +36,7 @@ public abstract class AbstractRecyclerViewAdapter extends DiffUtil.Callback { + public abstract static class AbstractDiffCallback extends DiffUtil.Callback { private List oldData; private List newData; diff --git a/app/src/main/java/org/mercury_im/messenger/ui/util/package-info.java b/app/src/main/java/org/mercury_im/messenger/ui/util/package-info.java new file mode 100644 index 0000000..a130fb6 --- /dev/null +++ b/app/src/main/java/org/mercury_im/messenger/ui/util/package-info.java @@ -0,0 +1,4 @@ +/** + * Some Javadoc information about the package. + */ +package org.mercury_im.messenger.ui.util; diff --git a/app/src/main/java/org/mercury_im/messenger/util/ColorUtil.java b/app/src/main/java/org/mercury_im/messenger/util/ColorUtil.java index 5b116dd..9414e64 100644 --- a/app/src/main/java/org/mercury_im/messenger/util/ColorUtil.java +++ b/app/src/main/java/org/mercury_im/messenger/util/ColorUtil.java @@ -149,7 +149,7 @@ public class ColorUtil { * * Android developer reference: Color - Decoding */ public static int blue(@ColorInt int color) { - return (color ) & 0xff; + return (color) & 0xff; } /** diff --git a/app/src/main/java/org/mercury_im/messenger/util/package-info.java b/app/src/main/java/org/mercury_im/messenger/util/package-info.java new file mode 100644 index 0000000..d374b05 --- /dev/null +++ b/app/src/main/java/org/mercury_im/messenger/util/package-info.java @@ -0,0 +1,4 @@ +/** + * Some Javadoc information about the package. + */ +package org.mercury_im.messenger.util;