Rename ui package login -> account

app/src/main/AndroidManifest.xml

@@ -33,7 +33,7 @@
             android:name=".ui.settings.SettingsActivity"
             android:label="@string/title_activity_settings" />
         <activity
-            android:name=".ui.login.LoginActivity"
+            android:name=".ui.account.LoginActivity"
             android:label="@string/title_activity_login" />
         <service android:name=".service.MercuryConnectionService" />
     </application>

app/src/main/java/org/mercury_im/messenger/di/component/AppComponent.java

@@ -11,9 +11,9 @@ import org.mercury_im.messenger.ui.chat.ChatInputFragment;
 import org.mercury_im.messenger.ui.chat.ChatInputViewModel;
 import org.mercury_im.messenger.ui.chat.ChatViewModel;
 import org.mercury_im.messenger.ui.chatlist.ChatListViewModel;
-import org.mercury_im.messenger.ui.login.AccountsViewModel;
+import org.mercury_im.messenger.ui.account.AccountsViewModel;
-import org.mercury_im.messenger.ui.login.LoginActivity;
+import org.mercury_im.messenger.ui.account.LoginActivity;
-import org.mercury_im.messenger.ui.login.LoginViewModel;
+import org.mercury_im.messenger.ui.account.LoginViewModel;
 import org.mercury_im.messenger.ui.roster.contacts.ContactListViewModel;
 
 import javax.inject.Singleton;

app/src/main/java/org/mercury_im/messenger/service/MercuryConnectionService.java

@@ -48,7 +48,6 @@ public class MercuryConnectionService extends Service {
 
     /**
      * PingManager will ensure the XMPP connection is kept alive.
-     * TODO: Move out of this service/module
      */
     private void beginLifecycleOfPingManager() {
         ServerPingWithAlarmManager.onCreate(this);
@@ -89,18 +88,16 @@ public class MercuryConnectionService extends Service {
         return START_STICKY_COMPATIBILITY;
     }
 
-    public void startAndDisplayForegroundNotification() {
+    private void startAndDisplayForegroundNotification() {
-        Notification notification = getForegroundNotification(getApplicationContext());
+        Notification notification = buildForegroundNotification(getApplicationContext());
-
         startForeground(Notifications.FOREGROUND_SERVICE_ID, notification);
     }
 
-    static Notification getForegroundNotification(Context context) {
+    private static Notification buildForegroundNotification(Context context) {
         Intent startMainActivityIntent = new Intent(context, MainActivity.class);
         PendingIntent pendingIntent = PendingIntent.getActivity(context, 0,
                 startMainActivityIntent, 0);
         return new NotificationCompat.Builder(context, Notifications.NOTIFICATION_CHANNEL__FOREGROUND_SERVICE)
-                .setContentTitle("Mercury")
                 .setSmallIcon(R.drawable.ic_send_black_24dp)
                 .setContentIntent(pendingIntent)
                 .build();

app/src/main/java/org/mercury_im/messenger/ui/MainActivity.java

@@ -15,11 +15,10 @@ import com.google.android.material.navigation.NavigationView;
 
 import org.mercury_im.messenger.MercuryImApplication;
 import org.mercury_im.messenger.R;
-import org.mercury_im.messenger.data.model.AccountModel;
 import org.mercury_im.messenger.data.repository.AccountRepository;
 import org.mercury_im.messenger.entity.Account;
 import org.mercury_im.messenger.ui.chatlist.ChatListFragment;
-import org.mercury_im.messenger.ui.login.AccountsFragment;
+import org.mercury_im.messenger.ui.account.AccountsFragment;
 import org.mercury_im.messenger.ui.roster.RosterFragment;
 import org.mercury_im.messenger.ui.settings.SettingsActivity;
 

app/src/main/java/org/mercury_im/messenger/ui/account/AccountsFragment.java

@@ -1,9 +1,8 @@
-package org.mercury_im.messenger.ui.login;
+package org.mercury_im.messenger.ui.account;
 
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,7 +14,6 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton;
 
-import org.mercury_im.messenger.MercuryImApplication;
 import org.mercury_im.messenger.R;
 import org.mercury_im.messenger.entity.Account;
 

app/src/main/java/org/mercury_im/messenger/ui/account/AccountsRecyclerViewAdapter.java

@@ -1,4 +1,4 @@
-package org.mercury_im.messenger.ui.login;
+package org.mercury_im.messenger.ui.account;
 
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -11,14 +11,12 @@ import android.widget.TextView;
 import androidx.recyclerview.widget.DiffUtil;
 import androidx.recyclerview.widget.RecyclerView;
 
-import org.mercury_im.messenger.MercuryImApplication;
 import org.mercury_im.messenger.Messenger;
 import org.mercury_im.messenger.R;
 import org.mercury_im.messenger.entity.Account;
 import org.mercury_im.messenger.ui.avatar.AvatarDrawable;
-import org.mercury_im.messenger.ui.login.AccountsFragment.OnAccountListItemClickListener;
+import org.mercury_im.messenger.ui.account.AccountsFragment.OnAccountListItemClickListener;
 import org.mercury_im.messenger.util.AbstractDiffCallback;
-import org.mercury_im.messenger.util.ColorUtil;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/org/mercury_im/messenger/ui/account/AccountsViewModel.java

@@ -1,4 +1,4 @@
-package org.mercury_im.messenger.ui.login;
+package org.mercury_im.messenger.ui.account;
 
 import android.app.Application;
 

app/src/main/java/org/mercury_im/messenger/ui/account/AddAccountDialog.java

@@ -1,4 +1,4 @@
-package org.mercury_im.messenger.ui.login;
+package org.mercury_im.messenger.ui.account;
 
 import android.content.Context;
 import android.os.Bundle;

app/src/main/java/org/mercury_im/messenger/ui/account/LoginActivity.java

@@ -1,4 +1,4 @@
-package org.mercury_im.messenger.ui.login;
+package org.mercury_im.messenger.ui.account;
 
 import android.os.Bundle;
 import android.view.KeyEvent;

app/src/main/java/org/mercury_im/messenger/ui/account/LoginViewModel.java

@@ -1,4 +1,4 @@
-package org.mercury_im.messenger.ui.login;
+package org.mercury_im.messenger.ui.account;
 
 import android.app.Application;
 import android.widget.Toast;
@@ -8,7 +8,6 @@ import androidx.lifecycle.AndroidViewModel;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 
-import org.jivesoftware.smack.sasl.SASLError;
 import org.jivesoftware.smack.sasl.SASLErrorException;
 import org.jxmpp.jid.EntityBareJid;
 import org.jxmpp.jid.impl.JidCreate;

app/src/main/java/org/mercury_im/messenger/ui/account/package-info.java

@@ -1,4 +1,4 @@
 /**
  * Some Javadoc information about the package.
  */
-package org.mercury_im.messenger.ui.login;
+package org.mercury_im.messenger.ui.account;

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

@@ -10,7 +10,7 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context=".ui.login.LoginActivity">
+    tools:context=".ui.account.LoginActivity">
 
     <LinearLayout
         android:id="@+id/jid_login_form"

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

@@ -14,7 +14,7 @@
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
         app:layoutManager="LinearLayoutManager"
-        tools:context="org.mercury_im.messenger.ui.login.AccountsFragment"
+        tools:context="org.mercury_im.messenger.ui.account.AccountsFragment"
         tools:listitem="@layout/list_item_account" />
 
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton