From cc1595f9d660bb80604df268741d48f59d98e503 Mon Sep 17 00:00:00 2001
From: pppscn <35696959@qq.com>
Date: Thu, 11 Feb 2021 23:36:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                      |  2 +-
 .../com/idormy/sms/forwarder/adapter/RuleAdapter.java |  6 ++++--
 app/src/main/res/layout/rule_item.xml                 | 11 +++++++++--
 app/src/main/res/layout/sender_item.xml               |  5 +++--
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4f496aaa..b0278b95 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -35,7 +35,7 @@
             android:label="转发规则" />
         <activity
             android:name="com.idormy.sms.forwarder.SenderActivity"
-            android:label="发送方设置" />
+            android:label="发送方" />
 
         <receiver android:name="com.idormy.sms.forwarder.BroadCastReceiver.RebootBroadcastReceiver">
             <intent-filter android:priority="2147483647">
diff --git a/app/src/main/java/com/idormy/sms/forwarder/adapter/RuleAdapter.java b/app/src/main/java/com/idormy/sms/forwarder/adapter/RuleAdapter.java
index 354e5e5d..42de201b 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/adapter/RuleAdapter.java
+++ b/app/src/main/java/com/idormy/sms/forwarder/adapter/RuleAdapter.java
@@ -5,6 +5,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.idormy.sms.forwarder.R;
@@ -61,6 +62,7 @@ public class RuleAdapter extends ArrayAdapter<RuleModel> {
             viewHolder = new ViewHolder();
             viewHolder.ruleMatch = view.findViewById(R.id.rule_match);
             viewHolder.ruleSender = view.findViewById(R.id.rule_sender);
+            viewHolder.ruleSenderImage = view.findViewById(R.id.rule_sender_image);
 
             // 将ViewHolder存储在View中（即将控件的实例存储在其中）
             view.setTag(viewHolder);
@@ -75,10 +77,9 @@ public class RuleAdapter extends ArrayAdapter<RuleModel> {
             viewHolder.ruleMatch.setText(ruleModel.getRuleMatch());
             if (!senderModel.isEmpty()) {
                 viewHolder.ruleSender.setText(senderModel.get(0).getName());
-
+                viewHolder.ruleSenderImage.setImageResource(senderModel.get(0).getImageId());
             } else {
                 viewHolder.ruleSender.setText("");
-
             }
         }
 
@@ -110,6 +111,7 @@ public class RuleAdapter extends ArrayAdapter<RuleModel> {
     class ViewHolder {
         TextView ruleMatch;
         TextView ruleSender;
+        ImageView ruleSenderImage;
     }
 
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/rule_item.xml b/app/src/main/res/layout/rule_item.xml
index 72d1b345..d69664a6 100644
--- a/app/src/main/res/layout/rule_item.xml
+++ b/app/src/main/res/layout/rule_item.xml
@@ -3,17 +3,24 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <ImageView
+        android:id="@+id/rule_sender_image"
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_margin="5dp"
+        android:layout_alignParentEnd="true" />
+
     <TextView
         android:id="@+id/rule_match"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_margin="10dp" />
+        android:layout_marginLeft="10dp" />
 
     <TextView
         android:id="@+id/rule_sender"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_margin="10dp" />
+        android:layout_marginLeft="10dp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/sender_item.xml b/app/src/main/res/layout/sender_item.xml
index 9e9ad19c..b325f023 100644
--- a/app/src/main/res/layout/sender_item.xml
+++ b/app/src/main/res/layout/sender_item.xml
@@ -5,8 +5,9 @@
 
     <ImageView
         android:id="@+id/sender_image"
-        android:layout_width="50dp"
-        android:layout_height="50dp" />
+        android:layout_width="32dp"
+        android:layout_height="32dp"
+        android:layout_margin="5dp" />
 
     <TextView
         android:id="@+id/sender_name"