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

Merge remote-tracking branch 'origin/r3.7'

Browse source
This commit is contained in:
Victor Shcherb 2020-05-22 11:33:23 +02:00
commit 7a62273962
5 changed files with 19 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,14 +21,9 @@
<ImageButton <ImageButton
android:id="@+id/close_button" android:id="@+id/close_button"
style="@style/Widget.AppCompat.Toolbar.Button.Navigation" style="@style/Widget.AppCompat.Toolbar.Button.Navigation"
android:layout_width="@dimen/standard_icon_size" android:layout_width="@dimen/toolbar_height"
android:layout_height="@dimen/standard_icon_size" android:layout_height="@dimen/toolbar_height"
android:layout_marginLeft="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding"
android:layout_marginRight="@dimen/content_padding"
android:layout_marginEnd="@dimen/content_padding"
android:contentDescription="@string/access_shared_string_navigate_up" android:contentDescription="@string/access_shared_string_navigate_up"
android:scaleType="fitCenter"
app:srcCompat="@drawable/ic_arrow_back" /> app:srcCompat="@drawable/ic_arrow_back" />
<LinearLayout <LinearLayout

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

@ -27,14 +27,9 @@
<ImageButton <ImageButton
android:id="@+id/close_button" android:id="@+id/close_button"
style="@style/Widget.AppCompat.Toolbar.Button.Navigation" style="@style/Widget.AppCompat.Toolbar.Button.Navigation"
android:layout_width="@dimen/standard_icon_size" android:layout_width="@dimen/toolbar_height"
android:layout_height="@dimen/standard_icon_size" android:layout_height="@dimen/toolbar_height"
android:layout_marginLeft="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding"
android:layout_marginRight="@dimen/content_padding"
android:layout_marginEnd="@dimen/content_padding"
android:contentDescription="@string/access_shared_string_navigate_up" android:contentDescription="@string/access_shared_string_navigate_up"
android:scaleType="fitCenter"
app:srcCompat="@drawable/ic_arrow_back" /> app:srcCompat="@drawable/ic_arrow_back" />
<net.osmand.plus.widgets.TextViewEx <net.osmand.plus.widgets.TextViewEx

23
OsmAnd/res/layout/point_editor_fragment_new.xml
View file

@ -18,27 +18,26 @@
<androidx.appcompat.widget.Toolbar <androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="fill_parent" android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_height" android:layout_height="@dimen/toolbar_height"
android:background="?attr/card_and_list_background_basic" android:background="?attr/card_and_list_background_basic"
android:paddingRight="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding"
android:minHeight="@dimen/toolbar_height" android:minHeight="@dimen/toolbar_height"
osmand:subtitleTextColor="?android:textColorPrimary" osmand:subtitleTextColor="?android:textColorPrimary"
osmand:theme="@style/ThemeOverlay.AppCompat.ActionBar" osmand:theme="@style/ThemeOverlay.AppCompat.ActionBar"
osmand:titleTextColor="?android:textColorPrimary"> osmand:titleTextColor="?android:textColorPrimary">
<androidx.appcompat.widget.AppCompatImageView <ImageButton
android:id="@+id/toolbar_action" android:id="@+id/toolbar_action"
android:layout_width="@dimen/standard_icon_size" style="@style/Widget.AppCompat.Toolbar.Button.Navigation"
android:layout_height="match_parent" android:layout_width="@dimen/acceptable_touch_radius"
android:layout_height="@dimen/acceptable_touch_radius"
android:layout_gravity="end" android:layout_gravity="end"
android:contentDescription="@string/replace_all" android:layout_marginStart="@dimen/list_item_button_padding"
app:srcCompat="@drawable/ic_action_replace" android:layout_marginLeft="@dimen/list_item_button_padding"
android:layout_marginRight="@dimen/content_padding_half" android:layout_marginEnd="@dimen/list_item_button_padding"
android:layout_marginStart="@dimen/content_padding_half" android:layout_marginRight="@dimen/list_item_button_padding"
android:layout_marginLeft="@dimen/content_padding" android:contentDescription="@string/access_shared_string_navigate_up"
android:layout_marginEnd="@dimen/content_padding" /> app:srcCompat="@drawable/ic_action_replace" />
</androidx.appcompat.widget.Toolbar> </androidx.appcompat.widget.Toolbar>

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

@ -21,14 +21,9 @@
<ImageButton <ImageButton
android:id="@+id/close_button" android:id="@+id/close_button"
style="@style/Widget.AppCompat.Toolbar.Button.Navigation" style="@style/Widget.AppCompat.Toolbar.Button.Navigation"
android:layout_width="@dimen/standard_icon_size" android:layout_width="@dimen/toolbar_height"
android:layout_height="@dimen/standard_icon_size" android:layout_height="@dimen/toolbar_height"
android:layout_marginLeft="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding"
android:layout_marginRight="@dimen/content_padding"
android:layout_marginEnd="@dimen/content_padding"
android:contentDescription="@string/access_shared_string_navigate_up" android:contentDescription="@string/access_shared_string_navigate_up"
android:scaleType="fitCenter"
osmand:srcCompat="@drawable/ic_arrow_back" osmand:srcCompat="@drawable/ic_arrow_back"
android:tint="?attr/default_icon_color" /> android:tint="?attr/default_icon_color" />

9
OsmAnd/res/layout/profile_preference_toolbar_with_switch.xml
View file

@ -27,14 +27,9 @@
<ImageButton <ImageButton
android:id="@+id/close_button" android:id="@+id/close_button"
style="@style/Widget.AppCompat.Toolbar.Button.Navigation" style="@style/Widget.AppCompat.Toolbar.Button.Navigation"
android:layout_width="@dimen/standard_icon_size" android:layout_width="@dimen/toolbar_height"
android:layout_height="@dimen/standard_icon_size" android:layout_height="@dimen/toolbar_height"
android:layout_marginLeft="@dimen/content_padding"
android:layout_marginStart="@dimen/content_padding"
android:layout_marginRight="@dimen/content_padding"
android:layout_marginEnd="@dimen/content_padding"
android:contentDescription="@string/access_shared_string_navigate_up" android:contentDescription="@string/access_shared_string_navigate_up"
android:scaleType="fitCenter"
osmand:srcCompat="@drawable/ic_arrow_back" osmand:srcCompat="@drawable/ic_arrow_back"
android:tint="?attr/default_icon_color" /> android:tint="?attr/default_icon_color" />