diff --git a/app/src/main/java/com/idormy/sms/forwarder/FrontService.java b/app/src/main/java/com/idormy/sms/forwarder/FrontService.java index 10b35002..7a770b6b 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/FrontService.java +++ b/app/src/main/java/com/idormy/sms/forwarder/FrontService.java @@ -21,7 +21,7 @@ public class FrontService extends Service { super.onCreate(); Log.i(TAG, "onCreate"); Notification.Builder builder = new Notification.Builder(this); - builder.setSmallIcon(R.mipmap.ic_launchert); + builder.setSmallIcon(R.mipmap.ic_launcher); builder.setContentTitle("短信转发器"); builder.setContentText("根据规则转发到钉钉/微信/邮箱/bark/webhook等"); Intent intent = new Intent(this, MainActivity.class); diff --git a/app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java b/app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java index b1306585..649a997f 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java +++ b/app/src/main/java/com/idormy/sms/forwarder/SenderActivity.java @@ -297,7 +297,7 @@ public class SenderActivity extends AppCompatActivity { Button buttonemailtest = view1.findViewById(R.id.buttonemailtest); alertDialog71 .setTitle(R.string.setemailtitle) - .setIcon(R.drawable.ic_baseline_email_24) + .setIcon(R.mipmap.email) .setView(view1) .create(); final AlertDialog show = alertDialog71.show(); diff --git a/app/src/main/java/com/idormy/sms/forwarder/model/SenderModel.java b/app/src/main/java/com/idormy/sms/forwarder/model/SenderModel.java index 2396d117..50ea41d1 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/model/SenderModel.java +++ b/app/src/main/java/com/idormy/sms/forwarder/model/SenderModel.java @@ -36,13 +36,17 @@ public class SenderModel { case (TYPE_DINGDING): return R.mipmap.dingding; case (TYPE_EMAIL): - return R.drawable.ic_baseline_email_24; + return R.mipmap.email; + case (TYPE_MESSAGE): + return R.mipmap.sms; + case (TYPE_WEB_NOTIFY): + return R.mipmap.webhook; case (TYPE_QYWX_GROUP_ROBOT): return R.mipmap.qywx; case (TYPE_BARK): - return R.mipmap.qywx; + return R.mipmap.bark; default: - return R.mipmap.ic_launcher_round; + return R.mipmap.ic_launcher; } } @@ -92,13 +96,17 @@ public class SenderModel { case (TYPE_DINGDING): return R.mipmap.dingding; case (TYPE_EMAIL): - return R.drawable.ic_baseline_email_24; + return R.mipmap.email; + case (TYPE_MESSAGE): + return R.mipmap.sms; + case (TYPE_WEB_NOTIFY): + return R.mipmap.webhook; case (TYPE_QYWX_GROUP_ROBOT): return R.mipmap.qywx; case (TYPE_BARK): - return R.mipmap.qywx; + return R.mipmap.bark; default: - return R.mipmap.ic_launcher_round; + return R.mipmap.ic_launcher; } } diff --git a/app/src/main/res/drawable/ic_baseline_email_24.xml b/app/src/main/res/drawable/ic_baseline_email_24.xml deleted file mode 100644 index 2c852177..00000000 --- a/app/src/main/res/drawable/ic_baseline_email_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index be316184..0b40c458 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,4 @@ - - + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index be316184..dd681c75 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,5 +1,4 @@ - - + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/qywx.xml b/app/src/main/res/mipmap-anydpi-v26/qywx.xml index 38ab7075..69165e83 100644 --- a/app/src/main/res/mipmap-anydpi-v26/qywx.xml +++ b/app/src/main/res/mipmap-anydpi-v26/qywx.xml @@ -1,5 +1,4 @@ - - + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/qywx_round.xml b/app/src/main/res/mipmap-anydpi-v26/qywx_round.xml deleted file mode 100644 index 38ab7075..00000000 --- a/app/src/main/res/mipmap-anydpi-v26/qywx_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/bark.png b/app/src/main/res/mipmap-hdpi/bark.png new file mode 100644 index 00000000..5670e55f Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/bark.png differ diff --git a/app/src/main/res/mipmap-hdpi/dingding.png b/app/src/main/res/mipmap-hdpi/dingding.png index 37537b31..b7e97474 100644 Binary files a/app/src/main/res/mipmap-hdpi/dingding.png and b/app/src/main/res/mipmap-hdpi/dingding.png differ diff --git a/app/src/main/res/mipmap-hdpi/dingding_round.png b/app/src/main/res/mipmap-hdpi/dingding_round.png deleted file mode 100644 index 699084cd..00000000 Binary files a/app/src/main/res/mipmap-hdpi/dingding_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/email.png b/app/src/main/res/mipmap-hdpi/email.png new file mode 100644 index 00000000..89a69cd0 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/email.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app/src/main/res/mipmap-hdpi/ic_launcher_background.png deleted file mode 100644 index 38f87330..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_background.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png deleted file mode 100644 index d93e2c0a..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launchert.jpg b/app/src/main/res/mipmap-hdpi/ic_launchert.jpg deleted file mode 100644 index af0d8fb5..00000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launchert.jpg and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/qywx.png b/app/src/main/res/mipmap-hdpi/qywx.png index 645cdc8e..41028c66 100644 Binary files a/app/src/main/res/mipmap-hdpi/qywx.png and b/app/src/main/res/mipmap-hdpi/qywx.png differ diff --git a/app/src/main/res/mipmap-hdpi/qywx_foreground.png b/app/src/main/res/mipmap-hdpi/qywx_foreground.png deleted file mode 100644 index 645cdc8e..00000000 Binary files a/app/src/main/res/mipmap-hdpi/qywx_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/qywx_round.png b/app/src/main/res/mipmap-hdpi/qywx_round.png deleted file mode 100644 index 64cca3d0..00000000 Binary files a/app/src/main/res/mipmap-hdpi/qywx_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/sms.png b/app/src/main/res/mipmap-hdpi/sms.png new file mode 100644 index 00000000..1c239a3f Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/sms.png differ diff --git a/app/src/main/res/mipmap-hdpi/webhook.png b/app/src/main/res/mipmap-hdpi/webhook.png new file mode 100644 index 00000000..01cfe2bb Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/webhook.png differ diff --git a/app/src/main/res/mipmap-mdpi/bark.png b/app/src/main/res/mipmap-mdpi/bark.png new file mode 100644 index 00000000..22f1315d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/bark.png differ diff --git a/app/src/main/res/mipmap-mdpi/dingding.png b/app/src/main/res/mipmap-mdpi/dingding.png index 9645f218..e4e5d61c 100644 Binary files a/app/src/main/res/mipmap-mdpi/dingding.png and b/app/src/main/res/mipmap-mdpi/dingding.png differ diff --git a/app/src/main/res/mipmap-mdpi/dingding_round.png b/app/src/main/res/mipmap-mdpi/dingding_round.png deleted file mode 100644 index 17ccddae..00000000 Binary files a/app/src/main/res/mipmap-mdpi/dingding_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/email.png b/app/src/main/res/mipmap-mdpi/email.png new file mode 100644 index 00000000..8ff6288c Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/email.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app/src/main/res/mipmap-mdpi/ic_launcher_background.png deleted file mode 100644 index 14e969ff..00000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_background.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png deleted file mode 100644 index 77303fbe..00000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launchert.jpg b/app/src/main/res/mipmap-mdpi/ic_launchert.jpg deleted file mode 100644 index af0d8fb5..00000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launchert.jpg and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/qywx.png b/app/src/main/res/mipmap-mdpi/qywx.png index 7248493f..b9b79525 100644 Binary files a/app/src/main/res/mipmap-mdpi/qywx.png and b/app/src/main/res/mipmap-mdpi/qywx.png differ diff --git a/app/src/main/res/mipmap-mdpi/qywx_foreground.png b/app/src/main/res/mipmap-mdpi/qywx_foreground.png deleted file mode 100644 index 7248493f..00000000 Binary files a/app/src/main/res/mipmap-mdpi/qywx_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/qywx_round.png b/app/src/main/res/mipmap-mdpi/qywx_round.png deleted file mode 100644 index 31ddce10..00000000 Binary files a/app/src/main/res/mipmap-mdpi/qywx_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/sms.png b/app/src/main/res/mipmap-mdpi/sms.png new file mode 100644 index 00000000..f8060a50 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/sms.png differ diff --git a/app/src/main/res/mipmap-mdpi/webhook.png b/app/src/main/res/mipmap-mdpi/webhook.png new file mode 100644 index 00000000..fef34af4 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/webhook.png differ diff --git a/app/src/main/res/mipmap-xhdpi/bark.png b/app/src/main/res/mipmap-xhdpi/bark.png new file mode 100644 index 00000000..fbfbe422 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/bark.png differ diff --git a/app/src/main/res/mipmap-xhdpi/dingding.png b/app/src/main/res/mipmap-xhdpi/dingding.png index 0a30bfd8..7d1b8072 100644 Binary files a/app/src/main/res/mipmap-xhdpi/dingding.png and b/app/src/main/res/mipmap-xhdpi/dingding.png differ diff --git a/app/src/main/res/mipmap-xhdpi/dingding_round.png b/app/src/main/res/mipmap-xhdpi/dingding_round.png deleted file mode 100644 index 0f2ecaae..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/dingding_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/email.png b/app/src/main/res/mipmap-xhdpi/email.png new file mode 100644 index 00000000..26c532cb Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/email.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png deleted file mode 100644 index 4ef75a9f..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png deleted file mode 100644 index 66b9054f..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launchert.jpg b/app/src/main/res/mipmap-xhdpi/ic_launchert.jpg deleted file mode 100644 index af0d8fb5..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launchert.jpg and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/qywx.png b/app/src/main/res/mipmap-xhdpi/qywx.png index 678a8615..3be657f9 100644 Binary files a/app/src/main/res/mipmap-xhdpi/qywx.png and b/app/src/main/res/mipmap-xhdpi/qywx.png differ diff --git a/app/src/main/res/mipmap-xhdpi/qywx_foreground.png b/app/src/main/res/mipmap-xhdpi/qywx_foreground.png deleted file mode 100644 index 678a8615..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/qywx_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/qywx_round.png b/app/src/main/res/mipmap-xhdpi/qywx_round.png deleted file mode 100644 index d35238cd..00000000 Binary files a/app/src/main/res/mipmap-xhdpi/qywx_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/sms.png b/app/src/main/res/mipmap-xhdpi/sms.png new file mode 100644 index 00000000..5c552d9f Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/sms.png differ diff --git a/app/src/main/res/mipmap-xhdpi/webhook.png b/app/src/main/res/mipmap-xhdpi/webhook.png new file mode 100644 index 00000000..a7e6eaa0 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/webhook.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/bark.png b/app/src/main/res/mipmap-xxhdpi/bark.png new file mode 100644 index 00000000..b555fc41 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/bark.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/dingding.png b/app/src/main/res/mipmap-xxhdpi/dingding.png index b0a9a964..6859dc9b 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/dingding.png and b/app/src/main/res/mipmap-xxhdpi/dingding.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/dingding_round.png b/app/src/main/res/mipmap-xxhdpi/dingding_round.png deleted file mode 100644 index cd6a1705..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/dingding_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/email.png b/app/src/main/res/mipmap-xxhdpi/email.png new file mode 100644 index 00000000..7223c73f Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/email.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png deleted file mode 100644 index 08475a35..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 985ca084..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launchert.jpg b/app/src/main/res/mipmap-xxhdpi/ic_launchert.jpg deleted file mode 100644 index af0d8fb5..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launchert.jpg and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/qywx.png b/app/src/main/res/mipmap-xxhdpi/qywx.png index 3d509edf..ca529c0e 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/qywx.png and b/app/src/main/res/mipmap-xxhdpi/qywx.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/qywx_foreground.png b/app/src/main/res/mipmap-xxhdpi/qywx_foreground.png deleted file mode 100644 index 3d509edf..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/qywx_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/qywx_round.png b/app/src/main/res/mipmap-xxhdpi/qywx_round.png deleted file mode 100644 index aae060ed..00000000 Binary files a/app/src/main/res/mipmap-xxhdpi/qywx_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/sms.png b/app/src/main/res/mipmap-xxhdpi/sms.png new file mode 100644 index 00000000..27b8f439 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/sms.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/webhook.png b/app/src/main/res/mipmap-xxhdpi/webhook.png new file mode 100644 index 00000000..7fdd28cc Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/webhook.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/bark.png b/app/src/main/res/mipmap-xxxhdpi/bark.png index ef3b523d..254f085f 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/bark.png and b/app/src/main/res/mipmap-xxxhdpi/bark.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/dingding.png b/app/src/main/res/mipmap-xxxhdpi/dingding.png index 7e3bafa5..a4cbd4f1 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/dingding.png and b/app/src/main/res/mipmap-xxxhdpi/dingding.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/dingding_round.png b/app/src/main/res/mipmap-xxxhdpi/dingding_round.png deleted file mode 100644 index fc88237a..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/dingding_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/email.png b/app/src/main/res/mipmap-xxxhdpi/email.png new file mode 100644 index 00000000..da8e3866 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/email.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png deleted file mode 100644 index 0876d22b..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png deleted file mode 100644 index 7679a22c..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launchert.jpg b/app/src/main/res/mipmap-xxxhdpi/ic_launchert.jpg deleted file mode 100644 index af0d8fb5..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launchert.jpg and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/qywx.png b/app/src/main/res/mipmap-xxxhdpi/qywx.png index a712ecba..afba6a49 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/qywx.png and b/app/src/main/res/mipmap-xxxhdpi/qywx.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/qywx_foreground.png b/app/src/main/res/mipmap-xxxhdpi/qywx_foreground.png deleted file mode 100644 index a712ecba..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/qywx_foreground.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/qywx_round.png b/app/src/main/res/mipmap-xxxhdpi/qywx_round.png deleted file mode 100644 index 5790fc4c..00000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/qywx_round.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/sms.png b/app/src/main/res/mipmap-xxxhdpi/sms.png new file mode 100644 index 00000000..3ca0546d Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/sms.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/webhook.png b/app/src/main/res/mipmap-xxxhdpi/webhook.png new file mode 100644 index 00000000..ae6e8805 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/webhook.png differ diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml index 3b88dc46..fdb7f9c7 100644 --- a/app/src/main/res/values/array.xml +++ b/app/src/main/res/values/array.xml @@ -3,8 +3,8 @@ 转发到钉钉机器人 转发到邮箱 - 转发到其他手机 - 转发到网页 + 转发到其他手机SMS + 转发到Webhook 转发到企业微信群机器人 转发到Bark diff --git a/psd/hdpi.psd b/psd/hdpi.psd new file mode 100644 index 00000000..b2b0ee6e Binary files /dev/null and b/psd/hdpi.psd differ diff --git a/psd/mdpi.psd b/psd/mdpi.psd new file mode 100644 index 00000000..fdae7596 Binary files /dev/null and b/psd/mdpi.psd differ diff --git a/psd/xhdpi.psd b/psd/xhdpi.psd new file mode 100644 index 00000000..05768bfe Binary files /dev/null and b/psd/xhdpi.psd differ diff --git a/psd/xxhdpi.psd b/psd/xxhdpi.psd new file mode 100644 index 00000000..7d8e679c Binary files /dev/null and b/psd/xxhdpi.psd differ diff --git a/psd/xxxhdpi.psd b/psd/xxxhdpi.psd new file mode 100644 index 00000000..ec2e8748 Binary files /dev/null and b/psd/xxxhdpi.psd differ