diff --git a/app/src/main/java/com/idormy/sms/forwarder/database/entity/Msg.kt b/app/src/main/java/com/idormy/sms/forwarder/database/entity/Msg.kt index 3c077e31..9111ea94 100644 --- a/app/src/main/java/com/idormy/sms/forwarder/database/entity/Msg.kt +++ b/app/src/main/java/com/idormy/sms/forwarder/database/entity/Msg.kt @@ -32,14 +32,14 @@ data class Msg( val simImageId: Int get() { - if (simInfo.isNotEmpty()) { - if (simInfo.replace("-", "").startsWith("SIM2")) { - return R.drawable.ic_sim2 //mipmap - } else if (simInfo.replace("-", "").startsWith("SIM1")) { - return R.drawable.ic_sim1 - } + return when { + type == "app" -> R.drawable.ic_app + simSlot == 0 -> R.drawable.ic_sim1 + simSlot == 1 -> R.drawable.ic_sim2 + simInfo.isNotEmpty() && simInfo.replace("-", "").startsWith("SIM2") -> R.drawable.ic_sim2 + simInfo.isNotEmpty() && simInfo.replace("-", "").startsWith("SIM1") -> R.drawable.ic_sim1 + else -> R.drawable.ic_sim } - return R.drawable.ic_sim } } \ No newline at end of file diff --git a/app/src/main/res/drawable-xhdpi/icon_api_battery_query.webp b/app/src/main/res/drawable-xhdpi/icon_api_battery_query.webp deleted file mode 100644 index 9218017c..00000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_api_battery_query.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_api_call_query.webp b/app/src/main/res/drawable-xhdpi/icon_api_call_query.webp deleted file mode 100644 index d55f8183..00000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_api_call_query.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_api_clone.webp b/app/src/main/res/drawable-xhdpi/icon_api_clone.webp deleted file mode 100644 index 817bbf7f..00000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_api_clone.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_api_contact_add.webp b/app/src/main/res/drawable-xhdpi/icon_api_contact_add.webp deleted file mode 100644 index 54c0aeec..00000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_api_contact_add.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_api_contact_query.webp b/app/src/main/res/drawable-xhdpi/icon_api_contact_query.webp deleted file mode 100644 index f40c4804..00000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_api_contact_query.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_api_location.webp b/app/src/main/res/drawable-xhdpi/icon_api_location.webp deleted file mode 100644 index 1cf7e1a3..00000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_api_location.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_api_sms_query.webp b/app/src/main/res/drawable-xhdpi/icon_api_sms_query.webp deleted file mode 100644 index c76fd837..00000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_api_sms_query.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_api_sms_send.webp b/app/src/main/res/drawable-xhdpi/icon_api_sms_send.webp deleted file mode 100644 index 6e9d5469..00000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_api_sms_send.webp and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon_api_wol.webp b/app/src/main/res/drawable-xhdpi/icon_api_wol.webp deleted file mode 100644 index 096c7fe9..00000000 Binary files a/app/src/main/res/drawable-xhdpi/icon_api_wol.webp and /dev/null differ diff --git a/app/src/main/res/drawable/ic_app.xml b/app/src/main/res/drawable/ic_app.xml index 48847ef4..cb11fd06 100644 --- a/app/src/main/res/drawable/ic_app.xml +++ b/app/src/main/res/drawable/ic_app.xml @@ -1,15 +1,23 @@ + android:width="40.0dip" + android:height="50.0dip" + android:viewportWidth="40.0" + android:viewportHeight="50.0"> + android:fillAlpha="0.8" + android:fillColor="?attr/colorControlNormal" + android:fillType="evenOdd" + android:pathData="M24.6702,0C26.9147,0 29.0561,0.9429 30.5715,2.5987L37.9014,10.6071C39.2513,12.0821 40,14.009 40,16.0084V44C40,47.3137 37.3137,50 34,50H6C2.6863,50 0,47.3137 0,44V6C0,2.6863 2.6863,0 6,0H24.6702Z" + android:strokeAlpha="0.8" /> + + \ No newline at end of file diff --git a/app/src/main/res/drawable/icon_api_battery_query.xml b/app/src/main/res/drawable/icon_api_battery_query.xml new file mode 100644 index 00000000..516c60d2 --- /dev/null +++ b/app/src/main/res/drawable/icon_api_battery_query.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/icon_api_call_query.xml b/app/src/main/res/drawable/icon_api_call_query.xml new file mode 100644 index 00000000..e2a6275b --- /dev/null +++ b/app/src/main/res/drawable/icon_api_call_query.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/icon_api_clone.xml b/app/src/main/res/drawable/icon_api_clone.xml new file mode 100644 index 00000000..344d2517 --- /dev/null +++ b/app/src/main/res/drawable/icon_api_clone.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/icon_api_contact_add.xml b/app/src/main/res/drawable/icon_api_contact_add.xml new file mode 100644 index 00000000..e3d334e6 --- /dev/null +++ b/app/src/main/res/drawable/icon_api_contact_add.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/icon_api_contact_query.xml b/app/src/main/res/drawable/icon_api_contact_query.xml new file mode 100644 index 00000000..0dcbb1db --- /dev/null +++ b/app/src/main/res/drawable/icon_api_contact_query.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/drawable/icon_api_location.xml b/app/src/main/res/drawable/icon_api_location.xml new file mode 100644 index 00000000..cc059ceb --- /dev/null +++ b/app/src/main/res/drawable/icon_api_location.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/icon_api_sms_query.xml b/app/src/main/res/drawable/icon_api_sms_query.xml new file mode 100644 index 00000000..8af2345f --- /dev/null +++ b/app/src/main/res/drawable/icon_api_sms_query.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/icon_api_sms_send.xml b/app/src/main/res/drawable/icon_api_sms_send.xml new file mode 100644 index 00000000..3069dfbe --- /dev/null +++ b/app/src/main/res/drawable/icon_api_sms_send.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/app/src/main/res/drawable/icon_api_wol.xml b/app/src/main/res/drawable/icon_api_wol.xml new file mode 100644 index 00000000..c64cac3b --- /dev/null +++ b/app/src/main/res/drawable/icon_api_wol.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/layout/adapter_tasks_card_view_list_item.xml b/app/src/main/res/layout/adapter_tasks_card_view_list_item.xml index 492bc71b..60f3e0bb 100644 --- a/app/src/main/res/layout/adapter_tasks_card_view_list_item.xml +++ b/app/src/main/res/layout/adapter_tasks_card_view_list_item.xml @@ -33,7 +33,7 @@ android:id="@+id/iv_arrow" android:layout_width="@dimen/card_view_image_size" android:layout_height="@dimen/card_view_image_size" - android:padding="@dimen/config_padding_8dp" + android:padding="4dp" android:scaleType="fitCenter" android:src="@drawable/auto_task_icon_left_arrow" tools:ignore="ContentDescription,ImageContrastCheck" /> @@ -92,46 +92,24 @@ android:layout_weight="1" android:orientation="vertical"> - - - - - - - - - - + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_tasks_action_frpc.xml b/app/src/main/res/layout/fragment_tasks_action_frpc.xml index 4e135fc8..167892c3 100644 --- a/app/src/main/res/layout/fragment_tasks_action_frpc.xml +++ b/app/src/main/res/layout/fragment_tasks_action_frpc.xml @@ -105,6 +105,7 @@ android:id="@+id/layout_frpcs" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/config_margin_5dp" android:orientation="vertical" /> diff --git a/app/src/main/res/layout/fragment_tasks_action_http_server.xml b/app/src/main/res/layout/fragment_tasks_action_http_server.xml index a31bd4c5..8235de60 100644 --- a/app/src/main/res/layout/fragment_tasks_action_http_server.xml +++ b/app/src/main/res/layout/fragment_tasks_action_http_server.xml @@ -59,8 +59,7 @@ + android:orientation="horizontal"> diff --git a/app/src/main/res/layout/fragment_tasks_action_sender.xml b/app/src/main/res/layout/fragment_tasks_action_sender.xml index 7757a91f..a5f14fb6 100644 --- a/app/src/main/res/layout/fragment_tasks_action_sender.xml +++ b/app/src/main/res/layout/fragment_tasks_action_sender.xml @@ -107,6 +107,7 @@ android:id="@+id/layout_senders" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/config_margin_5dp" android:orientation="vertical" /> diff --git a/app/src/main/res/layout/item_setting.xml b/app/src/main/res/layout/item_setting.xml index 57612ab8..7fd4f2f3 100644 --- a/app/src/main/res/layout/item_setting.xml +++ b/app/src/main/res/layout/item_setting.xml @@ -11,7 +11,8 @@ android:id="@+id/iv_setting_icon" android:layout_width="@dimen/card_view_image_size" android:layout_height="@dimen/card_view_image_size" - android:padding="@dimen/card_view_image_padding" + android:paddingStart="0dp" + android:paddingEnd="3dp" android:scaleType="fitCenter" tools:ignore="ContentDescription" />