From f08b7f2f93654e1f76d7e7dfbb9212c3c5994530 Mon Sep 17 00:00:00 2001 From: cepprice Date: Mon, 5 Apr 2021 17:58:04 +0500 Subject: [PATCH] UI review fixes --- OsmAnd/res/layout/contact_support.xml | 7 ++- .../divider_half_item_with_background.xml | 14 +++++ OsmAnd/res/layout/no_purchases_card.xml | 25 ++++----- OsmAnd/res/layout/subscriptions_card.xml | 13 +++-- OsmAnd/res/layout/troubleshooting_card.xml | 12 +++-- OsmAnd/res/xml/settings_main_screen.xml | 4 ++ .../net/osmand/plus/OsmandApplication.java | 54 ++++++++++++------- .../settings/fragments/PurchasesFragment.java | 9 +++- .../TroubleshootingOrPurchasingCard.java | 19 +++---- 9 files changed, 100 insertions(+), 57 deletions(-) create mode 100644 OsmAnd/res/layout/divider_half_item_with_background.xml diff --git a/OsmAnd/res/layout/contact_support.xml b/OsmAnd/res/layout/contact_support.xml index 30e45c4ea4..9a6ad434e0 100644 --- a/OsmAnd/res/layout/contact_support.xml +++ b/OsmAnd/res/layout/contact_support.xml @@ -25,7 +25,7 @@ android:layout_marginEnd="@dimen/map_widget_height" android:layout_marginRight="@dimen/map_widget_height" app:srcCompat="@drawable/ic_action_at_mail" - app:tint="?attr/active_color_basic" /> + app:tint="?attr/default_icon_color" /> + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/no_purchases_card.xml b/OsmAnd/res/layout/no_purchases_card.xml index 7bb787d4ab..1bbebf01ec 100644 --- a/OsmAnd/res/layout/no_purchases_card.xml +++ b/OsmAnd/res/layout/no_purchases_card.xml @@ -8,12 +8,12 @@ android:orientation="vertical"> - - - + android:background="?attr/activity_background_color"> + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/subscriptions_card.xml b/OsmAnd/res/layout/subscriptions_card.xml index b4deb45ffc..4635957ad7 100644 --- a/OsmAnd/res/layout/subscriptions_card.xml +++ b/OsmAnd/res/layout/subscriptions_card.xml @@ -141,7 +141,7 @@ android:layout_gravity="center_vertical" android:layout_marginEnd="@dimen/map_widget_height" android:layout_marginRight="@dimen/map_widget_height" - app:srcCompat="@drawable/ic_action_at_mail" + app:srcCompat="@drawable/ic_action_osm_live" app:tint="?attr/active_color_basic" /> - + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/troubleshooting_card.xml b/OsmAnd/res/layout/troubleshooting_card.xml index 96e6b3627d..e7de139dc1 100644 --- a/OsmAnd/res/layout/troubleshooting_card.xml +++ b/OsmAnd/res/layout/troubleshooting_card.xml @@ -85,12 +85,14 @@ android:id="@+id/contact_support_container" layout="@layout/contact_support" /> - - - + android:background="?attr/activity_background_color"> + + + + \ No newline at end of file diff --git a/OsmAnd/res/xml/settings_main_screen.xml b/OsmAnd/res/xml/settings_main_screen.xml index 849a687964..641de8088a 100644 --- a/OsmAnd/res/xml/settings_main_screen.xml +++ b/OsmAnd/res/xml/settings_main_screen.xml @@ -13,6 +13,10 @@ app:fragment="net.osmand.plus.settings.fragments.GlobalSettingsFragment" tools:icon="@drawable/ic_action_settings" /> + +