ChatViewer now also uses ContactTitleActionBarInflater....

ChatViewer now also uses ContactTitleActionBarInflater. ContactTitleActionBarInflater better encapsulates inner views.

app/src/main/java/com/xabber/android/ui/ChatViewer.java

@@ -16,26 +16,17 @@ package com.xabber.android.ui;
 
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.drawable.ColorDrawable;
-import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
-import android.support.v7.app.ActionBar;
-import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-import android.view.animation.Animation;
-import android.view.animation.AnimationUtils;
 import android.widget.ImageView;
 
 import com.xabber.android.data.ActivityManager;
 import com.xabber.android.data.Application;
 import com.xabber.android.data.NetworkException;
 import com.xabber.android.data.SettingsManager;
-import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.account.OnAccountChangedListener;
 import com.xabber.android.data.entity.BaseEntity;
 import com.xabber.android.data.extension.archive.MessageArchiveManager;
@@ -56,7 +47,7 @@ import com.xabber.android.data.roster.OnContactChangedListener;
 import com.xabber.android.data.roster.RosterManager;
 import com.xabber.android.ui.adapter.ChatViewerAdapter;
 import com.xabber.android.ui.dialog.ChatExportDialogFragment;
-import com.xabber.android.ui.helper.ContactTitleInflater;
+import com.xabber.android.ui.helper.ContactTitleActionBarInflater;
 import com.xabber.android.ui.helper.ManagedActivity;
 import com.xabber.android.ui.preferences.ChatEditor;
 import com.xabber.androiddev.R;
@@ -92,19 +83,14 @@ public class ChatViewer extends ManagedActivity implements OnChatChangedListener
     ChatViewerAdapter chatViewerAdapter;
 
     ViewPager viewPager;
-    private View actionBarView;
 
     Collection<ChatViewerFragment> registeredChats = new HashSet<>();
     Collection<RecentChatFragment> recentChatFragments = new HashSet<>();
 
     private String actionWithAccount = null;
     private String actionWithUser = null;
-    private int[] accountActionBarColors;
-    private int[] accountStatusBarColors;
-    private Window window;
-    private int defaultStatusBarColor;
 
-    private Animation shakeAnimation;
+    private ContactTitleActionBarInflater contactTitleActionBarInflater;
 
     private boolean isChatSelected;
     private Menu menu = null;
@@ -133,38 +119,16 @@ public class ChatViewer extends ManagedActivity implements OnChatChangedListener
             exitOnSend = savedInstanceState.getBoolean(SAVED_EXIT_ON_SEND);
         }
 
-        shakeAnimation = AnimationUtils.loadAnimation(this, R.anim.shake);
+        contactTitleActionBarInflater = new ContactTitleActionBarInflater(this);
+        contactTitleActionBarInflater.setUpActionBarView();
 
-        window = getWindow();
-        window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-        window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            defaultStatusBarColor = window.getStatusBarColor();
-        }
-
-        accountActionBarColors = getResources().getIntArray(R.array.account_action_bar);
-        accountStatusBarColors = getResources().getIntArray(R.array.account_status_bar);
-
-
-        ActionBar actionBar = getSupportActionBar();
-        actionBar.setDisplayShowTitleEnabled(false);
-        actionBar.setDisplayShowHomeEnabled(false);
-        actionBar.setDisplayHomeAsUpEnabled(true);
-        actionBar.setDisplayShowCustomEnabled(true);
-
-        actionBarView = LayoutInflater.from(this).inflate(R.layout.contact_title, null);
-
-        actionBarView.setOnClickListener(new View.OnClickListener() {
+        contactTitleActionBarInflater.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 scrollChat();
             }
         });
 
-        actionBar.setCustomView(actionBarView, new ActionBar.LayoutParams(
-                ActionBar.LayoutParams.MATCH_PARENT, ActionBar.LayoutParams.MATCH_PARENT));
-
         setContentView(R.layout.activity_chat_viewer);
 
         if (account != null && user != null) {
@@ -584,11 +548,9 @@ public class ChatViewer extends ManagedActivity implements OnChatChangedListener
                 && actionWithUser != null && actionWithUser.equals(user)) {
             updateActionBar(account, user);
             if (incoming) {
-                actionBarView.findViewById(R.id.name_holder).startAnimation(shakeAnimation);
+                contactTitleActionBarInflater.playIncomingAnimation();
             }
         }
-
-
     }
 
     @Override
@@ -649,13 +611,7 @@ public class ChatViewer extends ManagedActivity implements OnChatChangedListener
         createOptionsMenu();
 
         if (!isChatSelected) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-                window.setStatusBarColor(defaultStatusBarColor);
-            }
-            getSupportActionBar().setBackgroundDrawable(null);
-            getSupportActionBar().setDisplayShowTitleEnabled(true);
-            actionBarView.setVisibility(View.GONE);
-            setTitle(getString(R.string.chat_list));
+            contactTitleActionBarInflater.restoreDefaultTitleView(getString(R.string.chat_list));
             MessageManager.getInstance().removeVisibleChat();
             return;
         }
@@ -672,20 +628,14 @@ public class ChatViewer extends ManagedActivity implements OnChatChangedListener
     }
 
     private void updateActionBar(String account, String user) {
-        actionBarView.setVisibility(View.VISIBLE);
-        getSupportActionBar().setDisplayShowTitleEnabled(false);
         final AbstractContact abstractContact = RosterManager.getInstance().getBestContact(account, user);
-        ContactTitleInflater.updateTitle(actionBarView, this, abstractContact);
 
-        int colorLevel = AccountManager.getInstance().getColorLevel(abstractContact.getAccount());
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            window.setStatusBarColor(accountStatusBarColors[colorLevel]);
-        }
-        getSupportActionBar().setBackgroundDrawable(new ColorDrawable(accountActionBarColors[colorLevel]));
+        contactTitleActionBarInflater.update(abstractContact);
 
         SecurityLevel securityLevel = OTRManager.getInstance().getSecurityLevel(account, user);
         SettingsManager.SecurityOtrMode securityOtrMode = SettingsManager.securityOtrMode();
-        ImageView securityView = (ImageView) actionBarView.findViewById(R.id.security);
+
+        ImageView securityView = contactTitleActionBarInflater.getSecurityView();
 
         if (securityLevel == SecurityLevel.plain
                 && (securityOtrMode == SettingsManager.SecurityOtrMode.disabled

app/src/main/java/com/xabber/android/ui/ContactEditor.java

@@ -17,10 +17,8 @@ package com.xabber.android.ui;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.view.View;
 import android.widget.AdapterView;
 import android.widget.EditText;
-import android.widget.TextView;
 
 import com.xabber.android.data.Application;
 import com.xabber.android.data.NetworkException;
@@ -51,7 +49,7 @@ public class ContactEditor extends GroupListActivity implements
         super.onCreate(savedInstanceState);
 
         contactTitleActionBarInflater = new ContactTitleActionBarInflater(this);
-        contactTitleActionBarInflater.setActionBarView();
+        contactTitleActionBarInflater.setUpActionBarView();
     }
 
     @Override
@@ -103,12 +101,8 @@ public class ContactEditor extends GroupListActivity implements
     private void update() {
         AbstractContact abstractContact = RosterManager.getInstance().getBestContact(account, user);
         contactTitleActionBarInflater.update(abstractContact);
-
-        View actionBarView = contactTitleActionBarInflater.getActionBarView();
-
-        ((TextView) actionBarView.findViewById(R.id.name))
-                .setText(getString(R.string.contact_editor_title, abstractContact.getName()));
-        ((TextView) actionBarView.findViewById(R.id.status_text)).setText(user);
+        contactTitleActionBarInflater.setName(getString(R.string.contact_editor_title, abstractContact.getName()));
+        contactTitleActionBarInflater.setStatusText(user);
     }
 
     @Override

app/src/main/java/com/xabber/android/ui/FingerprintViewer.java

@@ -119,7 +119,7 @@ public class FingerprintViewer extends ManagedActivity implements
         isUpdating = false;
 
         contactTitleActionBarInflater = new ContactTitleActionBarInflater(this);
-        contactTitleActionBarInflater.setActionBarView();
+        contactTitleActionBarInflater.setUpActionBarView();
     }
 
     @Override

app/src/main/java/com/xabber/android/ui/QuestionViewer.java

@@ -102,7 +102,7 @@ public class QuestionViewer extends ManagedActivity implements
         findViewById(R.id.send).setOnClickListener(this);
 
         contactTitleActionBarInflater = new ContactTitleActionBarInflater(this);
-        contactTitleActionBarInflater.setActionBarView();
+        contactTitleActionBarInflater.setUpActionBarView();
     }
 
     @Override

app/src/main/java/com/xabber/android/ui/helper/ContactTitleActionBarInflater.java

@@ -8,6 +8,10 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
+import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.xabber.android.data.account.AccountManager;
 import com.xabber.android.data.roster.AbstractContact;
@@ -20,17 +24,17 @@ public class ContactTitleActionBarInflater {
 
     private int[] accountActionBarColors;
     private int[] accountStatusBarColors;
+
     private Window window;
+    private int defaultStatusBarColor;
+
+    private Animation shakeAnimation = null;
 
     public ContactTitleActionBarInflater(ActionBarActivity activity) {
         this.activity = activity;
     }
 
-    public void setActionBarView() {
-        window = this.activity.getWindow();
-        window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
-        window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-
+    public void setUpActionBarView() {
         accountActionBarColors = activity.getResources().getIntArray(R.array.account_action_bar);
         accountStatusBarColors = activity.getResources().getIntArray(R.array.account_status_bar);
 
@@ -44,9 +48,19 @@ public class ContactTitleActionBarInflater {
 
         actionBar.setCustomView(actionBarView, new ActionBar.LayoutParams(
                 ActionBar.LayoutParams.MATCH_PARENT, ActionBar.LayoutParams.MATCH_PARENT));
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            window = this.activity.getWindow();
+            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
+            window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
+            defaultStatusBarColor = window.getStatusBarColor();
+        }
     }
 
     public void update(AbstractContact abstractContact) {
+        activity.getSupportActionBar().setDisplayShowTitleEnabled(false);
+        actionBarView.setVisibility(View.VISIBLE);
+
         ContactTitleInflater.updateTitle(actionBarView, activity, abstractContact);
 
         int colorLevel = AccountManager.getInstance().getColorLevel(abstractContact.getAccount());
@@ -56,7 +70,37 @@ public class ContactTitleActionBarInflater {
         activity.getSupportActionBar().setBackgroundDrawable(new ColorDrawable(accountActionBarColors[colorLevel]));
     }
 
-    public View getActionBarView() {
-        return actionBarView;
+    public void restoreDefaultTitleView(String title) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            window.setStatusBarColor(defaultStatusBarColor);
+        }
+
+        activity.getSupportActionBar().setBackgroundDrawable(null);
+        activity.getSupportActionBar().setDisplayShowTitleEnabled(true);
+        actionBarView.setVisibility(View.GONE);
+        activity.setTitle(title);
+    }
+
+    public ImageView getSecurityView() {
+        return (ImageView)actionBarView.findViewById(R.id.security);
+    }
+
+    public void playIncomingAnimation() {
+        if (shakeAnimation == null) {
+            shakeAnimation = AnimationUtils.loadAnimation(activity, R.anim.shake);
+        }
+        actionBarView.findViewById(R.id.name_holder).startAnimation(shakeAnimation);
+    }
+
+    public void setOnClickListener(View.OnClickListener onClickListener) {
+        actionBarView.setOnClickListener(onClickListener);
+    }
+
+    public void setName(String name) {
+        ((TextView) actionBarView.findViewById(R.id.name)).setText(name);
+    }
+
+    public void setStatusText(String user) {
+        ((TextView) actionBarView.findViewById(R.id.status_text)).setText(user);
     }
 }