liuzhenxing1118 3 years ago
parent
commit
29c22e2157

+ 0 - 8
app/src/main/java/com/xplora/xplauncher/activity/MainActivity.java

@@ -1,15 +1,9 @@
 package com.xplora.xplauncher.activity;
 
-import androidx.annotation.RequiresApi;
 import androidx.viewpager.widget.ViewPager;
 
 import android.content.ComponentName;
 import android.content.Intent;
-import android.content.pm.ResolveInfo;
-import android.os.Build;
-import android.provider.ContactsContract;
-import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.View;
 
 import com.xplora.xplauncher.R;
@@ -20,10 +14,8 @@ import com.xplora.xplauncher.broadcast.TimeBroadcastReceiver;
 import com.xplora.xplauncher.data.DataManager;
 import com.xplora.xplauncher.model.AppModel;
 import com.xplora.xplauncher.model.ContactModel;
-import com.xplora.xplauncher.model.RecentModel;
 import com.xplora.xplauncher.utils.Constant;
 import com.xplora.xplauncher.view.AppsPager;
-import com.xplora.xplauncher.view.AppsPager;
 import com.xplora.xplauncher.view.BasePager;
 import com.xplora.xplauncher.view.ContactsPager;
 import com.xplora.xplauncher.view.HomePager;

+ 8 - 15
app/src/main/java/com/xplora/xplauncher/adapter/ContactsRecyclerAdapter.java

@@ -2,31 +2,24 @@ package com.xplora.xplauncher.adapter;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.pm.ResolveInfo;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
+
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.xplora.xplauncher.R;
 import com.xplora.xplauncher.model.AppModel;
 import com.xplora.xplauncher.model.ContactModel;
-import com.xplora.xplauncher.model.RecentModel;
 import com.xplora.xplauncher.utils.Constant;
 import com.xplora.xplauncher.utils.ResUtils;
-import com.xplora.xplauncher.view.AppItemView;
-import com.xplora.xplauncher.view.RecentItemView;
+import com.xplora.xplauncher.view.ContactItemView;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.transform.Result;
-
-public class ContactsRecyclerAdapter extends RecyclerView.Adapter<RecentItemView> {
+public class ContactsRecyclerAdapter extends RecyclerView.Adapter<ContactItemView> {
     private Context mContext;
     private int mViewType = 0;
     private List<ContactModel> mDataList = new ArrayList<>();
@@ -40,20 +33,20 @@ public class ContactsRecyclerAdapter extends RecyclerView.Adapter<RecentItemView
 
     @NonNull
     @Override
-    public RecentItemView onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
+    public ContactItemView onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
         int layoutId = mViewType == 0 ? R.layout.item_recent : R.layout.item_contact;
         View view = LayoutInflater.from(viewGroup.getContext()).inflate(layoutId, viewGroup, false);
-        RecentItemView holder = new RecentItemView(view);
+        ContactItemView holder = new ContactItemView(view);
         return holder;
     }
 
     @Override
-    public void onBindViewHolder(@NonNull RecentItemView viewHolder, @SuppressLint("RecyclerView") int i) {
+    public void onBindViewHolder(@NonNull ContactItemView viewHolder, @SuppressLint("RecyclerView") int i) {
         ContactModel model = mDataList.get(i);
         setAppViewHolder(viewHolder, i, model);
     }
 
-    public void setAppViewHolder(@NonNull RecentItemView viewHolder, int index, ContactModel model) {
+    public void setAppViewHolder(@NonNull ContactItemView viewHolder, int index, ContactModel model) {
 
         //viewHolder.mContactIcon.setImageDrawable(mContext.getDrawable(recentModel.getCallType()));
         //viewHolder.mContactHead.setImageDrawable(mContext.getDrawable(recentModel.getContactIcon()));
@@ -87,7 +80,7 @@ public class ContactsRecyclerAdapter extends RecyclerView.Adapter<RecentItemView
     }
 
     @Override
-    public void onViewRecycled(@NonNull RecentItemView holder) {
+    public void onViewRecycled(@NonNull ContactItemView holder) {
         super.onViewRecycled(holder);
     }
 

+ 0 - 1
app/src/main/java/com/xplora/xplauncher/data/DataManager.java

@@ -9,7 +9,6 @@ import android.graphics.drawable.Drawable;
 import com.xplora.xplauncher.R;
 import com.xplora.xplauncher.model.AppModel;
 import com.xplora.xplauncher.model.ContactModel;
-import com.xplora.xplauncher.model.RecentModel;
 import com.xplora.xplauncher.utils.Constant;
 import com.xplora.xplauncher.utils.ResUtils;
 

+ 0 - 42
app/src/main/java/com/xplora/xplauncher/model/RecentModel.java

@@ -1,42 +0,0 @@
-package com.xplora.xplauncher.model;
-
-import android.graphics.drawable.Drawable;
-
-public class RecentModel {
-    private int contactIcon = 0;
-    private String contactName = "";
-    private int callTime = 0;
-    private int callType = 0;
-
-    public int getContactIcon() {
-        return contactIcon;
-    }
-
-    public void setContactIcon(int drawable) {
-        this.contactIcon = drawable;
-    }
-
-    public String getContactName() {
-        return contactName;
-    }
-
-    public void setContactName(String contactName) {
-        this.contactName = contactName;
-    }
-
-    public int getCallTime() {
-        return callTime;
-    }
-
-    public void setCallTime(int callTime) {
-        this.callTime = callTime;
-    }
-
-    public int getCallType() {
-        return callType;
-    }
-
-    public void setCallType(int callType) {
-        this.callType = callType;
-    }
-}

+ 2 - 2
app/src/main/java/com/xplora/xplauncher/view/RecentItemView.java → app/src/main/java/com/xplora/xplauncher/view/ContactItemView.java

@@ -10,13 +10,13 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.xplora.xplauncher.R;
 
-public class RecentItemView extends RecyclerView.ViewHolder{
+public class ContactItemView extends RecyclerView.ViewHolder{
     public ImageView mContactIcon;
     public ImageView mContactHead;
     public TextView mContactName;
     public TextView mCallTime;
 
-    public RecentItemView(@NonNull View itemView) {
+    public ContactItemView(@NonNull View itemView) {
         super(itemView);
         mContactIcon = itemView.findViewById(R.id.item_call_type);
         mContactHead = itemView.findViewById(R.id.item_head);

+ 0 - 4
app/src/main/java/com/xplora/xplauncher/view/ContactsPager.java

@@ -11,11 +11,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.xplora.xplauncher.R;
 import com.xplora.xplauncher.adapter.ContactsRecyclerAdapter;
-import com.xplora.xplauncher.adapter.RecyclerAdapter;
-import com.xplora.xplauncher.model.AppModel;
 import com.xplora.xplauncher.model.ContactModel;
-import com.xplora.xplauncher.model.RecentModel;
-import com.xplora.xplauncher.utils.Constant;
 
 import java.util.ArrayList;
 import java.util.List;