liuzhenxing1118 3 жил өмнө
parent
commit
d2f3723e31

+ 11 - 1
app/src/main/java/com/xplora/xplauncher/adapter/ContactsRecyclerAdapter.java

@@ -17,12 +17,15 @@ 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 java.util.ArrayList;
 import java.util.List;
 
+import javax.xml.transform.Result;
+
 public class ContactsRecyclerAdapter extends RecyclerView.Adapter<RecentItemView> {
     private Context mContext;
     private int mViewType = 0;
@@ -54,7 +57,14 @@ public class ContactsRecyclerAdapter extends RecyclerView.Adapter<RecentItemView
 
         //viewHolder.mContactIcon.setImageDrawable(mContext.getDrawable(recentModel.getCallType()));
         //viewHolder.mContactHead.setImageDrawable(mContext.getDrawable(recentModel.getContactIcon()));
-        viewHolder.mContactName.setText(model.getContactName());
+
+        if (viewHolder.mContactIcon != null) {
+            int callTypeImage = ResUtils.getImageId("call_type_", model.getCallType());
+            viewHolder.mContactIcon.setImageResource(callTypeImage);
+        }
+        if (viewHolder.mContactName != null) {
+            viewHolder.mContactName.setText(model.getContactName());
+        }
 
 //        viewHolder.mAppIcon.setOnClickListener(new View.OnClickListener() {
 //            @Override

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

@@ -126,11 +126,11 @@ public class DataManager {
     }
 
     public void loadRecent() {
-        for (int i = 0; i < 3; i++) {
+        for (int i = 0; i < 4; i++) {
             ContactModel model = new ContactModel();
             model.setContactIcon(R.drawable.contact_head);
             model.setContactName("recent" + i);
-            model.setCallType(0);
+            model.setCallType(i);
             model.setCallTime(0);
             mRecentList.add(model);
         }
@@ -143,7 +143,7 @@ public class DataManager {
     public void loadContacts() {
         for (int i = 0; i < 6; i++) {
             ContactModel model = new ContactModel();
-            model.setCallType(R.drawable.call_type_0);
+            model.setCallType(i);
             model.setContactIcon(R.drawable.contact_head);
             model.setContactName("name" + i);
             model.setCallTime(0);

BIN
app/src/main/res/drawable-xhdpi/call_type_1.png


BIN
app/src/main/res/drawable-xhdpi/call_type_2.png


BIN
app/src/main/res/drawable-xhdpi/call_type_3.png


+ 13 - 18
app/src/main/res/layout/item_recent.xml

@@ -7,26 +7,21 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="40dp"
-        android:layout_marginLeft="12dp"
-        android:layout_marginRight="12dp"
+        android:gravity="center_vertical"
         >
 
         <ImageView
             android:id="@+id/item_call_type"
             android:layout_width="17dp"
             android:layout_height="17dp"
-            android:layout_centerVertical="true"
-            android:layout_alignParentStart="true"
-            android:src="@drawable/call_type_0"
+            android:layout_marginStart="20dp"
             />
 
         <ImageView
             android:id="@+id/item_head"
-            android:layout_width="17dp"
-            android:layout_height="17dp"
-            android:layout_marginStart="20dp"
-            android:layout_centerVertical="true"
-            android:layout_alignParentStart="true"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_marginStart="4dp"
             android:src="@drawable/contact_head"
             />
 
@@ -34,23 +29,23 @@
             android:id="@+id/item_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
+            android:layout_marginStart="8dp"
             android:fontFamily="Roboto"
-            android:layout_centerVertical="true"
+            android:textFontWeight="500"
             android:textColor="@color/white"
-            android:textSize="13sp" />
+            android:textSize="10sp" />
 
         <TextView
             android:id="@+id/item_title_detail"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
+            android:layout_marginStart="15dp"
             android:fontFamily="Roboto"
-            android:layout_centerVertical="true"
-            android:layout_alignParentEnd="true"
-            android:textColor="@color/white"
+            android:textFontWeight="400"
+            android:textColor="#FFA462"
             android:textSize="10sp"
-            tools:ignore="RelativeOverlap" />
+            android:text="yestoday"
+            />
 
     </LinearLayout>