ContactViewer and ContactViewerFragment moved from ui.preference package to ui.

app/src/main/AndroidManifest.xml

@@ -219,7 +219,7 @@
 
         <activity
             android:label="@string/contact_viewer"
-            android:name="com.xabber.android.ui.preferences.ContactViewer"
+            android:name="com.xabber.android.ui.ContactViewer"
             android:parentActivityName="com.xabber.android.ui.ContactList"
             >
             <!-- Parent activity meta-data to support 4.0 and lower -->

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

@@ -58,7 +58,6 @@ import com.xabber.android.ui.dialog.ChatExportDialogFragment;
 import com.xabber.android.ui.helper.ContactTitleActionBarInflater;
 import com.xabber.android.ui.helper.ManagedActivity;
 import com.xabber.android.ui.preferences.ChatEditor;
-import com.xabber.android.ui.preferences.ContactViewer;
 import com.xabber.androiddev.R;
 
 import java.util.Collection;

app/src/main/java/com/xabber/android/ui/preferences/ContactViewer.java → app/src/main/java/com/xabber/android/ui/ContactViewer.java

@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU General Public License,
  * along with this program. If not, see http://www.gnu.org/licenses/.
  */
-package com.xabber.android.ui.preferences;
+package com.xabber.android.ui;
 
 import android.content.Context;
 import android.content.Intent;
@@ -54,8 +54,8 @@ import java.util.Map;
 public class ContactViewer extends ManagedActivity implements
         OnVCardListener, OnContactChangedListener, OnAccountChangedListener {
 
-    private static final String SAVED_VCARD = "com.xabber.android.ui.preferences.ContactViewer.SAVED_VCARD";
-    private static final String SAVED_VCARD_ERROR = "com.xabber.android.ui.preferences.ContactViewer.SAVED_VCARD_ERROR";
+    private static final String SAVED_VCARD = "com.xabber.android.ui.ContactViewer.SAVED_VCARD";
+    private static final String SAVED_VCARD_ERROR = "com.xabber.android.ui.ContactViewer.SAVED_VCARD_ERROR";
 
     private String account;
     private String bareAddress;

app/src/main/java/com/xabber/android/ui/preferences/ContactViewerFragment.java → app/src/main/java/com/xabber/android/ui/ContactViewerFragment.java

-package com.xabber.android.ui.preferences;
+package com.xabber.android.ui;
 
 import android.app.Activity;
 import android.app.Fragment;

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

@@ -44,7 +44,7 @@ import com.xabber.android.ui.dialog.GroupDeleteDialogFragment;
 import com.xabber.android.ui.dialog.GroupRenameDialogFragment;
 import com.xabber.android.ui.dialog.MUCDeleteDialogFragment;
 import com.xabber.android.ui.preferences.AccountEditor;
-import com.xabber.android.ui.preferences.ContactViewer;
+import com.xabber.android.ui.ContactViewer;
 import com.xabber.androiddev.R;
 
 /**