Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #8760 from osmandapp/Fix_tablet_layout

Browse source 
Fix tablet layout paddings in appBar, fix bearing icon background.
This commit is contained in:
vshcherb 2020-04-08 14:54:30 +02:00 committed by GitHub
commit f7038fd5e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
OsmAnd/res/layout/preference_select_icon_button.xml
View file

@ -3,31 +3,36 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="6dp"> android:padding="@dimen/map_button_margin">
<FrameLayout
android:layout_width="@dimen/setting_select_icon_button_width"
android:layout_height="@dimen/setting_select_icon_button_height">
<ImageView <ImageView
android:id="@+id/outlineRect" android:id="@+id/outlineRect"
android:layout_width="164dp" android:layout_width="match_parent"
android:layout_height="128dp" android:layout_height="match_parent"
app:srcCompat="@drawable/bg_select_icon_button_outline" /> app:srcCompat="@drawable/bg_select_icon_button_outline" />
<ImageView <ImageView
android:id="@+id/backgroundRect" android:id="@+id/backgroundRect"
android:layout_width="156dp" android:layout_width="match_parent"
android:layout_height="120dp" android:layout_height="match_parent"
android:layout_margin="4dp" android:layout_margin="@dimen/list_item_button_padding"
android:background="@drawable/bg_select_icon_button" /> android:background="@drawable/bg_select_icon_button" />
<ImageView <ImageView
android:id="@+id/headingIcon" 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" />
<ImageView <ImageView
android:id="@+id/icon" android:id="@+id/icon"
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" />
</FrameLayout>
</FrameLayout> </FrameLayout>

2
OsmAnd/res/values/sizes.xml
View file

@ -356,6 +356,8 @@
<dimen name="settings_divider_margin_start">72dp</dimen> <dimen name="settings_divider_margin_start">72dp</dimen>
<dimen name="setting_list_item_large_height">72dp</dimen> <dimen name="setting_list_item_large_height">72dp</dimen>
<dimen name="setting_list_item_small_height">42dp</dimen> <dimen name="setting_list_item_small_height">42dp</dimen>
<dimen name="setting_select_icon_button_height">128dp</dimen>
<dimen name="setting_select_icon_button_width">164dp</dimen>
<dimen name="slider_thumb_size">8dp</dimen> <dimen name="slider_thumb_size">8dp</dimen>
<dimen name="slider_thumb_halo_size">12dp</dimen> <dimen name="slider_thumb_halo_size">12dp</dimen>

6
OsmAnd/res/values/styles.xml
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>