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

Fix appbar height

Browse source
This commit is contained in:
Dima-1 2020-05-26 23:10:23 +03:00
parent 917270784d
commit 077d5fcf6c
10 changed files with 36 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/res/layout/global_preference_toolbar.xml
View file

@ -5,6 +5,7 @@
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="@dimen/toolbar_height"
android:background="?attr/actionModeBackground" android:background="?attr/actionModeBackground"
android:padding="0dp" android:padding="0dp"
app:contentInsetLeft="0dp" app:contentInsetLeft="0dp"

1
OsmAnd/res/layout/global_preferences_toolbar_with_switch.xml
View file

@ -6,6 +6,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/actionModeBackground" android:background="?attr/actionModeBackground"
android:minHeight="@dimen/toolbar_height"
app:contentInsetLeft="0dp" app:contentInsetLeft="0dp"
app:contentInsetStart="0dp" app:contentInsetStart="0dp"
app:contentInsetRight="0dp" app:contentInsetRight="0dp"

1
OsmAnd/res/layout/profile_preference_toolbar.xml
View file

@ -4,6 +4,7 @@
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="@dimen/toolbar_height"
osmand:contentInsetLeft="0dp" osmand:contentInsetLeft="0dp"
osmand:contentInsetStart="0dp" osmand:contentInsetStart="0dp"
osmand:contentInsetRight="0dp" osmand:contentInsetRight="0dp"

1
OsmAnd/res/layout/profile_preference_toolbar_with_icon.xml
View file

@ -6,6 +6,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/actionModeBackground" android:background="?attr/actionModeBackground"
android:minHeight="@dimen/toolbar_height" android:minHeight="@dimen/toolbar_height"
android:padding="0dp"
osmand:contentInsetLeft="0dp" osmand:contentInsetLeft="0dp"
osmand:contentInsetStart="0dp" osmand:contentInsetStart="0dp"
osmand:contentInsetRight="0dp" osmand:contentInsetRight="0dp"

27
OsmAnd/res/layout/search_advanced_coords.xml
View file

@ -1,10 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:osmand="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="match_parent" android:layout_width="match_parent"
android:orientation="vertical"> android:layout_height="match_parent"
android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -17,8 +18,10 @@
android:background="@color/osmand_orange" android:background="@color/osmand_orange"
android:minHeight="@dimen/dashboard_map_toolbar" android:minHeight="@dimen/dashboard_map_toolbar"
android:theme="?attr/toolbar_theme" android:theme="?attr/toolbar_theme"
app:contentInsetLeft="54dp" android:padding="0dp"
app:contentInsetStart="54dp" app:contentInsetStartWithNavigation="@dimen/toolbar_inset_start_with_navigation"
app:contentInsetLeft="0dp"
app:contentInsetStart="0dp"
app:contentInsetRight="0dp" app:contentInsetRight="0dp"
app:contentInsetEnd="0dp"> app:contentInsetEnd="0dp">
@ -28,10 +31,11 @@
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView <net.osmand.plus.widgets.TextViewEx
android:id="@+id/titleEdit" android:id="@+id/titleEdit"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:letterSpacing="@dimen/text_button_letter_spacing"
android:layout_weight="1" android:layout_weight="1"
android:background="@null" android:background="@null"
android:ellipsize="end" android:ellipsize="end"
@ -40,7 +44,8 @@
android:singleLine="true" android:singleLine="true"
android:text="@string/coords_search" android:text="@string/coords_search"
android:textColor="@color/color_white" android:textColor="@color/color_white"
android:textSize="@dimen/default_list_text_size_large"/> osmand:typeface="@string/font_roboto_medium"
android:textSize="@dimen/dialog_header_text_size"/>
<ProgressBar <ProgressBar
android:id="@+id/searchProgressBar" android:id="@+id/searchProgressBar"
@ -50,8 +55,8 @@
android:layout_marginLeft="8dp" android:layout_marginLeft="8dp"
android:indeterminate="true" android:indeterminate="true"
android:visibility="gone" android:visibility="gone"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginEnd="8dp" /> android:layout_marginEnd="8dp" />
</LinearLayout> </LinearLayout>

16
OsmAnd/res/layout/search_custom_poi.xml
View file

@ -9,7 +9,7 @@
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="@dimen/toolbar_height">
<androidx.appcompat.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
@ -18,8 +18,10 @@
android:background="@color/osmand_orange" android:background="@color/osmand_orange"
android:minHeight="@dimen/toolbar_height" android:minHeight="@dimen/toolbar_height"
android:theme="?attr/toolbar_theme" android:theme="?attr/toolbar_theme"
app:contentInsetLeft="54dp" android:padding="0dp"
app:contentInsetStart="54dp" app:contentInsetStartWithNavigation="@dimen/toolbar_inset_start_with_navigation"
app:contentInsetLeft="0dp"
app:contentInsetStart="0dp"
app:contentInsetRight="0dp" app:contentInsetRight="0dp"
app:contentInsetEnd="0dp"> app:contentInsetEnd="0dp">
@ -31,15 +33,14 @@
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="14dp"
android:layout_marginTop="14dp"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
<TextView <net.osmand.plus.widgets.TextViewEx
android:id="@+id/title" android:id="@+id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:letterSpacing="@dimen/text_button_letter_spacing"
android:background="@null" android:background="@null"
android:ellipsize="end" android:ellipsize="end"
android:lines="1" android:lines="1"
@ -47,7 +48,8 @@
android:singleLine="true" android:singleLine="true"
android:text="@string/create_custom_poi" android:text="@string/create_custom_poi"
android:textColor="@color/color_white" android:textColor="@color/color_white"
android:textSize="@dimen/default_list_text_size_large"/> osmand:typeface="@string/font_roboto_medium"
android:textSize="@dimen/dialog_header_text_size"/>
</LinearLayout> </LinearLayout>

5
OsmAnd/res/layout/search_dialog_fragment.xml
View file

@ -24,8 +24,9 @@
android:minHeight="@dimen/dashboard_map_toolbar" android:minHeight="@dimen/dashboard_map_toolbar"
android:padding="0dp" android:padding="0dp"
android:theme="?attr/toolbar_theme" android:theme="?attr/toolbar_theme"
app:contentInsetLeft="54dp" app:contentInsetStartWithNavigation="@dimen/toolbar_inset_start_with_navigation"
app:contentInsetStart="54dp" app:contentInsetLeft="0dp"
app:contentInsetStart="0dp"
app:contentInsetRight="0dp" app:contentInsetRight="0dp"
app:contentInsetEnd="0dp"> app:contentInsetEnd="0dp">

1
OsmAnd/res/values-large/sizes.xml
View file

@ -121,7 +121,6 @@
<dimen name="bottom_sheet_menu_peek_height">450dp</dimen> <dimen name="bottom_sheet_menu_peek_height">450dp</dimen>
<dimen name="side_of_the_world_button_size">54dp</dimen> <dimen name="side_of_the_world_button_size">54dp</dimen>
<dimen name="toolbar_height">64dp</dimen>
<dimen name="poi_icon_size">24dp</dimen> <dimen name="poi_icon_size">24dp</dimen>
</resources> </resources>

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

@ -9,7 +9,7 @@
<dimen name="wpt_list_category_height">60dp</dimen> <dimen name="wpt_list_category_height">60dp</dimen>
<dimen name="wpt_list_item_height">56dp</dimen> <dimen name="wpt_list_item_height">56dp</dimen>
<dimen name="list_item_button_padding">4dp</dimen> <dimen name="list_item_button_padding">4dp</dimen>
<dimen name="action_bar_height">64dp</dimen> <dimen name="action_bar_height">56dp</dimen>
<dimen name="list_content_padding_large">32dp</dimen> <dimen name="list_content_padding_large">32dp</dimen>
<dimen name="title_padding">20dp</dimen> <dimen name="title_padding">20dp</dimen>
<dimen name="title_text_size">28sp</dimen> <dimen name="title_text_size">28sp</dimen>
@ -335,6 +335,7 @@
<dimen name="toolbar_height">56dp</dimen> <dimen name="toolbar_height">56dp</dimen>
<dimen name="toolbar_height_expanded">96dp</dimen> <dimen name="toolbar_height_expanded">96dp</dimen>
<dimen name="toolbar_inset_start_with_navigation">72dp</dimen>
<dimen name="wikivoyage_search_list_header_height">36dp</dimen> <dimen name="wikivoyage_search_list_header_height">36dp</dimen>
<dimen name="wikivoyage_article_card_icon_size">80dp</dimen> <dimen name="wikivoyage_article_card_icon_size">80dp</dimen>

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

@ -287,6 +287,7 @@
<item name="preferenceTheme">@style/OsmandPreferenceTheme</item> <item name="preferenceTheme">@style/OsmandPreferenceTheme</item>
<item name="stroked_buttons_and_links_outline">@color/stroked_buttons_and_links_outline_light</item> <item name="stroked_buttons_and_links_outline">@color/stroked_buttons_and_links_outline_light</item>
<item name="btn_bg_border_inactive">@drawable/btn_bg_border_inactive_light</item> <item name="btn_bg_border_inactive">@drawable/btn_bg_border_inactive_light</item>
<item name="actionBarSize">@dimen/action_bar_height</item>
</style> </style>
<style name="OverflowMenuButton" parent="@style/Widget.AppCompat.ActionButton.Overflow"> <style name="OverflowMenuButton" parent="@style/Widget.AppCompat.ActionButton.Overflow">
@ -556,6 +557,7 @@
<item name="preferenceTheme">@style/OsmandPreferenceTheme</item> <item name="preferenceTheme">@style/OsmandPreferenceTheme</item>
<item name="stroked_buttons_and_links_outline">@color/stroked_buttons_and_links_outline_dark</item> <item name="stroked_buttons_and_links_outline">@color/stroked_buttons_and_links_outline_dark</item>
<item name="btn_bg_border_inactive">@drawable/btn_bg_border_inactive_dark</item> <item name="btn_bg_border_inactive">@drawable/btn_bg_border_inactive_dark</item>
<item name="actionBarSize">@dimen/action_bar_height</item>
</style> </style>
<style name="FreeVersionBanner" parent="OsmandDarkTheme"> <style name="FreeVersionBanner" parent="OsmandDarkTheme">