refactor source tree, and use ButterKnife

app/src/main/AndroidManifest.xml

@@ -41,7 +41,7 @@
         android:theme="@android:style/Theme.Holo.Light.NoActionBar">
 
         <activity
-            android:name=".ui.activity.ChatActivity"
+            android:name=".chat.activity.ChatActivity"
             android:launchMode="singleTask"
             android:theme="@style/MainTheme" />
 
@@ -55,61 +55,61 @@
         </receiver>
 
         <activity
-            android:name=".ui.activity.MainActivity"
+            android:name=".ui.MainActivity"
             android:launchMode="singleTask" />
 
         <activity
-            android:name=".ui.activity.UpdateContentActivity"
+            android:name=".ui.base_activity.UpdateContentActivity"
             android:theme="@style/MainTheme" />
 
         <activity
-            android:name=".ui.activity.EntrySplashActivity"
+            android:name=".ui.entry.EntrySplashActivity"
             android:theme="@android:style/Theme.Holo.Light.NoActionBar.Fullscreen">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
-        <activity android:name=".ui.activity.ImageBrowserActivity" />
+        <activity android:name=".chat.activity.ImageBrowserActivity" />
 
         <activity
-            android:name=".ui.activity.LocationActivity"
+            android:name=".chat.activity.LocationActivity"
             android:theme="@style/MainTheme" />
 
-        <activity android:name=".ui.activity.EntryLoginActivity" />
+        <activity android:name=".ui.entry.EntryLoginActivity" />
 
         <activity
-            android:name=".ui.activity.EntryRegisterActivity"
+            android:name=".ui.entry.EntryRegisterActivity"
             android:theme="@style/MainTheme" />
 
         <activity
-            android:name=".ui.activity.NewFriendActivity"
+            android:name=".ui.contact.NewFriendActivity"
             android:theme="@style/MainTheme" />
 
         <activity
-            android:name=".ui.activity.AddFriendActivity"
+            android:name=".ui.contact.AddFriendActivity"
             android:theme="@style/MainTheme" />
 
         <activity
-            android:name=".ui.activity.PersonInfoActivity"
+            android:name=".ui.profile.PersonInfoActivity"
             android:theme="@style/MainTheme" />
 
         <activity
-            android:name=".ui.activity.NotifySettingActivity"
+            android:name=".ui.profile.NotifySettingActivity"
             android:theme="@style/MainTheme" />
 
         <activity
-            android:name=".ui.activity.GroupConvListActivity"
+            android:name=".ui.contact.GroupConvListActivity"
             android:label="@string/group"
             android:theme="@style/MainTheme" />
 
         <activity
-            android:name=".ui.activity.ConvDetailActivity"
+            android:name=".ui.conversation.ConvDetailActivity"
             android:theme="@style/MainTheme" />
 
         <activity
-            android:name=".ui.activity.ConvAddMembersActivity"
+            android:name=".ui.conversation.ConvAddMembersActivity"
             android:label="@string/inviteMembers"
             android:theme="@style/MainTheme" />
 

app/src/main/java/com/avoscloud/chat/adapter/AddFriendAdapter.java

@@ -9,7 +9,8 @@
 import android.widget.TextView;
 import com.avos.avoscloud.AVUser;
 import com.avoscloud.chat.R;
-import com.avoscloud.chat.avobject.User;
+import com.avoscloud.chat.chat.adapter.BaseListAdapter;
+import com.avoscloud.chat.entity.avobject.User;
 import com.avoscloud.chat.service.UserService;
 import com.avoscloud.chat.ui.view.ViewHolder;
 

app/src/main/java/com/avoscloud/chat/adapter/BaseCheckListAdapter.java

@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
+import com.avoscloud.chat.chat.adapter.BaseListAdapter;
 import com.avoscloud.chat.util.Logger;
 
 import java.util.ArrayList;

app/src/main/java/com/avoscloud/chat/adapter/GroupAdapter.java

@@ -6,7 +6,8 @@
 import android.widget.TextView;
 import com.avos.avoscloud.im.v2.AVIMConversation;
 import com.avoscloud.chat.R;
-import com.avoscloud.chat.service.chat.ConvManager;
+import com.avoscloud.chat.chat.adapter.BaseListAdapter;
+import com.avoscloud.chat.chat.controller.ConvManager;
 import com.avoscloud.chat.ui.view.ViewHolder;
 
 import java.util.List;

app/src/main/java/com/avoscloud/chat/adapter/GroupAddMembersAdapter.java

@@ -4,11 +4,14 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.TextView;
 import com.avos.avoscloud.AVUser;
 import com.avoscloud.chat.R;
+import com.avoscloud.chat.entity.avobject.User;
 import com.avoscloud.chat.service.CacheService;
+import com.avoscloud.chat.service.UserService;
 import com.avoscloud.chat.ui.view.ViewHolder;
-import com.avoscloud.chat.util.ChatUtils;
 
 import java.util.List;
 
@@ -28,7 +31,10 @@ public View getView(final int position, View conView, ViewGroup parent) {
     }
     String userId = datas.get(position);
     AVUser user = CacheService.lookupUser(userId);
-    ChatUtils.setUserView(conView, user);
+    ImageView avatarView = ViewHolder.findViewById(conView, R.id.avatar);
+    TextView nameView = ViewHolder.findViewById(conView, R.id.username);
+    UserService.displayAvatar(User.getAvatarUrl(user), avatarView);
+    nameView.setText(user.getUsername());
     CheckBox checkBox = ViewHolder.findViewById(conView, R.id.checkbox);
     setCheckBox(checkBox, position);
     checkBox.setOnCheckedChangeListener(new CheckListener(position));

app/src/main/java/com/avoscloud/chat/adapter/GroupUsersAdapter.java

@@ -3,9 +3,14 @@
 import android.content.Context;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
 import com.avos.avoscloud.AVUser;
 import com.avoscloud.chat.R;
-import com.avoscloud.chat.util.ChatUtils;
+import com.avoscloud.chat.chat.adapter.BaseListAdapter;
+import com.avoscloud.chat.entity.avobject.User;
+import com.avoscloud.chat.service.UserService;
+import com.avoscloud.chat.ui.view.ViewHolder;
 
 import java.util.List;
 
@@ -23,7 +28,10 @@ public View getView(int position, View conView, ViewGroup parent) {
       conView = View.inflate(ctx, R.layout.group_user_item, null);
     }
     AVUser user = datas.get(position);
-    ChatUtils.setUserView(conView, user);
+    ImageView avatarView = ViewHolder.findViewById(conView, R.id.avatar);
+    TextView nameView = ViewHolder.findViewById(conView, R.id.username);
+    UserService.displayAvatar(User.getAvatarUrl(user), avatarView);
+    nameView.setText(user.getUsername());
     return conView;
   }
 }

app/src/main/java/com/avoscloud/chat/adapter/NearPeopleAdapter.java

@@ -8,7 +8,8 @@
 import com.avos.avoscloud.AVGeoPoint;
 import com.avos.avoscloud.AVUser;
 import com.avoscloud.chat.R;
-import com.avoscloud.chat.avobject.User;
+import com.avoscloud.chat.chat.adapter.BaseListAdapter;
+import com.avoscloud.chat.entity.avobject.User;
 import com.avoscloud.chat.base.App;
 import com.avoscloud.chat.service.PreferenceMap;
 import com.avoscloud.chat.service.UserService;

app/src/main/java/com/avoscloud/chat/adapter/NewFriendAdapter.java

@@ -9,7 +9,8 @@
 import android.widget.TextView;
 import com.avos.avoscloud.AVUser;
 import com.avoscloud.chat.R;
-import com.avoscloud.chat.avobject.AddRequest;
+import com.avoscloud.chat.chat.adapter.BaseListAdapter;
+import com.avoscloud.chat.entity.avobject.AddRequest;
 import com.avoscloud.chat.service.UserService;
 import com.avoscloud.chat.ui.view.ViewHolder;
 

app/src/main/java/com/avoscloud/chat/adapter/RoomAdapter.java

@@ -7,12 +7,13 @@
 import android.widget.TextView;
 import com.avos.avoscloud.AVUser;
 import com.avoscloud.chat.R;
-import com.avoscloud.chat.entity.ConvType;
-import com.avoscloud.chat.entity.Room;
+import com.avoscloud.chat.chat.adapter.BaseListAdapter;
+import com.avoscloud.chat.chat.model.ConvType;
+import com.avoscloud.chat.chat.model.Room;
 import com.avoscloud.chat.service.CacheService;
 import com.avoscloud.chat.service.UserService;
-import com.avoscloud.chat.service.chat.ConvManager;
-import com.avoscloud.chat.service.chat.MsgUtils;
+import com.avoscloud.chat.chat.controller.ConvManager;
+import com.avoscloud.chat.chat.controller.MsgUtils;
 import com.avoscloud.chat.ui.view.ViewHolder;
 import com.avoscloud.chat.util.TimeUtils;
 

app/src/main/java/com/avoscloud/chat/adapter/UserAdapter.java

@@ -9,7 +9,7 @@
 import android.widget.TextView;
 import com.avos.avoscloud.AVUser;
 import com.avoscloud.chat.R;
-import com.avoscloud.chat.avobject.User;
+import com.avoscloud.chat.entity.avobject.User;
 import com.avoscloud.chat.base.C;
 import com.avoscloud.chat.service.UserService;
 import com.avoscloud.chat.ui.view.ViewHolder;

app/src/main/java/com/avoscloud/chat/adapter/UserFriendAdapter.java

@@ -5,64 +5,34 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.SectionIndexer;
 import android.widget.TextView;
 import com.avoscloud.chat.R;
-import com.avoscloud.chat.avobject.User;
+import com.avoscloud.chat.chat.adapter.BaseListAdapter;
 import com.avoscloud.chat.entity.SortUser;
+import com.avoscloud.chat.entity.avobject.User;
 import com.avoscloud.chat.service.UserService;
 import com.avoscloud.chat.ui.view.ViewHolder;
 
-import java.util.List;
-
 @SuppressLint("DefaultLocale")
-public class UserFriendAdapter extends BaseAdapter implements SectionIndexer {
-  private Context ct;
-  private List<SortUser> data;
-
-  public UserFriendAdapter(Context ct, List<SortUser> datas) {
-    this.ct = ct;
-    this.data = datas;
-  }
-
-  public void updateDatas(List<SortUser> list) {
-    this.data = list;
-    notifyDataSetChanged();
-  }
-
-  public void remove(SortUser user) {
-    this.data.remove(user);
-    notifyDataSetChanged();
-  }
+public class UserFriendAdapter extends BaseListAdapter<SortUser> implements SectionIndexer {
 
-  @Override
-  public int getCount() {
-    return data.size();
-  }
-
-  @Override
-  public Object getItem(int position) {
-    return data.get(position);
-  }
-
-  @Override
-  public long getItemId(int position) {
-    return 0;
+  public UserFriendAdapter(Context ctx) {
+    super(ctx);
   }
 
   @Override
   public View getView(int position, View convertView, ViewGroup parent) {
     if (convertView == null) {
-      convertView = LayoutInflater.from(ct).inflate(
+      convertView = LayoutInflater.from(ctx).inflate(
           R.layout.item_user_friend, null);
     }
     TextView alpha = ViewHolder.findViewById(convertView, R.id.alpha);
     TextView nameView = ViewHolder.findViewById(convertView, R.id.tv_friend_name);
     ImageView avatarView = ViewHolder.findViewById(convertView, R.id.img_friend_avatar);
 
-    SortUser friend = data.get(position);
+    SortUser friend = datas.get(position);
     final String name = friend.getInnerUser().getUsername();
     final String avatarUrl = User.getAvatarUrl(friend.getInnerUser());
 
@@ -81,20 +51,19 @@ public View getView(int position, View convertView, ViewGroup parent) {
   }
 
   public int getSectionForPosition(int position) {
-    return data.get(position).getSortLetters().charAt(0);
+    return datas.get(position).getSortLetters().charAt(0);
   }
 
 
   @SuppressLint("DefaultLocale")
   public int getPositionForSection(int section) {
     for (int i = 0; i < getCount(); i++) {
-      String sortStr = data.get(i).getSortLetters();
+      String sortStr = datas.get(i).getSortLetters();
       char firstChar = sortStr.toUpperCase().charAt(0);
       if (firstChar == section) {
         return i;
       }
     }
-
     return -1;
   }
 

app/src/main/java/com/avoscloud/chat/base/App.java

@@ -7,11 +7,11 @@
 import android.os.StrictMode;
 import com.avos.avoscloud.*;
 import com.avoscloud.chat.R;
-import com.avoscloud.chat.avobject.AddRequest;
-import com.avoscloud.chat.avobject.UpdateInfo;
+import com.avoscloud.chat.entity.avobject.AddRequest;
+import com.avoscloud.chat.entity.avobject.UpdateInfo;
 import com.avoscloud.chat.service.UpdateService;
-import com.avoscloud.chat.service.chat.IM;
-import com.avoscloud.chat.ui.activity.EntrySplashActivity;
+import com.avoscloud.chat.chat.controller.ChatManager;
+import com.avoscloud.chat.ui.entry.EntrySplashActivity;
 import com.avoscloud.chat.util.Logger;
 import com.avoscloud.chat.util.PhotoUtils;
 import com.avoscloud.chat.util.Utils;
@@ -104,10 +104,10 @@ public void onCreate() {
     AVOSCloud.setDebugLogEnabled(debug);
     AVAnalytics.enableCrashReport(this, !debug);
 
-    IM im = IM.getInstance();
-    im.init();
+    ChatManager chatManager = ChatManager.getInstance();
+    chatManager.init();
     if (AVUser.getCurrentUser() != null) {
-      im.setupWithCurrentUser();
+      chatManager.setupWithCurrentUser();
     }
 
     if (App.debug) {

app/src/main/java/com/avoscloud/chat/base/C.java

@@ -19,5 +19,4 @@ public class C {
   public static final String CONV = "conv";
   public static final String TYPE = "type";
   public static String FROM_NAME = "fromName";
-
 }