Fix tablet layout paddings in appBar, fix bearing icon background.

This commit is contained in:
Dima-1 2020-04-06 17:12:08 +03:00
parent d57328969c
commit 42bb573b11
2 changed files with 30 additions and 21 deletions

View file

@ -5,29 +5,34 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="6dp"> android:padding="6dp">
<ImageView <FrameLayout
android:id="@+id/outlineRect"
android:layout_width="164dp" android:layout_width="164dp"
android:layout_height="128dp" android:layout_height="128dp">
app:srcCompat="@drawable/bg_select_icon_button_outline" />
<ImageView <ImageView
android:id="@+id/backgroundRect" android:id="@+id/outlineRect"
android:layout_width="156dp" android:layout_width="match_parent"
android:layout_height="120dp" android:layout_height="match_parent"
android:layout_margin="4dp" app:srcCompat="@drawable/bg_select_icon_button_outline" />
android:background="@drawable/bg_select_icon_button" />
<ImageView <ImageView
android:id="@+id/headingIcon" android:id="@+id/backgroundRect"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_gravity="center_horizontal|center_vertical" /> android:layout_margin="4dp"
android:background="@drawable/bg_select_icon_button" />
<ImageView <ImageView
android:id="@+id/icon" android:id="@+id/headingIcon"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|center_vertical" /> android:layout_gravity="center_horizontal|center_vertical" />
<ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal|center_vertical" />
</FrameLayout>
</FrameLayout> </FrameLayout>

View file

@ -564,7 +564,7 @@
<item name="android:textColor">@color/active_color_primary_dark</item> <item name="android:textColor">@color/active_color_primary_dark</item>
</style> </style>
<style name="OsmandPreferenceTheme" parent="@style/PreferenceThemeOverlay.v14.Material"> <style name="OsmandPreferenceTheme" parent="@style/PreferenceThemeOverlay">
<item name="android:layout">@layout/preferences_screen</item> <item name="android:layout">@layout/preferences_screen</item>
<item name="iconSpaceReserved">true</item> <item name="iconSpaceReserved">true</item>
</style> </style>
@ -768,4 +768,8 @@
<item name="android:textColor">?attr/app_bar_primary_item_color</item> <item name="android:textColor">?attr/app_bar_primary_item_color</item>
<item name="android:textSize">@dimen/dialog_header_text_size</item> <item name="android:textSize">@dimen/dialog_header_text_size</item>
</style> </style>
<style name="ThemeOverlay.AppCompat.ActionBar">
<item name="android:padding">0dp</item>
</style>
</resources> </resources>