Skip to content

Commit

Permalink
Merge pull request #17411 from osmandapp/terrain_redesign
Browse files Browse the repository at this point in the history 
Terrain redesign
  • Loading branch information
@Chumva
Chumva committed Jun 26, 2023
2 parents 3a886b8 + d872c46 commit 92eb08e
Show file tree
Hide file tree
Showing 20 changed files with 1,153 additions and 345 deletions.
2 changes: 2 additions & 0 deletions OsmAnd-api/src/net/osmand/aidlapi/OsmAndCustomizationConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ public interface OsmAndCustomizationConstants {
String UNDERLAY_MAP = SHOW_ITEMS_ID_SCHEME + "underlay_map";
String CONTOUR_LINES = SHOW_ITEMS_ID_SCHEME + "contour_lines";
String TERRAIN_ID = SHOW_ITEMS_ID_SCHEME + "terrain";
String TERRAIN_CATEGORY_ID = SHOW_ITEMS_ID_SCHEME + "terrain_category";
String TERRAIN_DESCRIPTION_ID = SHOW_ITEMS_ID_SCHEME + "terrain_description";
String WEATHER_ID = SHOW_ITEMS_ID_SCHEME + "weather";
String MAP_ENABLE_3D_MAPS_ID = SHOW_ITEMS_ID_SCHEME + "enable_3d_maps";

Expand Down
119 changes: 119 additions & 0 deletions OsmAnd/res/layout/configure_map_option_fragment.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_transparent">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">

<LinearLayout
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/list_background_color"
android:orientation="horizontal">

<ImageButton
android:id="@+id/back_button"
style="@style/Widget.AppCompat.ActionButton"
android:layout_width="@dimen/toolbar_height"
android:layout_height="@dimen/toolbar_height"
android:layout_gravity="center_vertical"
android:contentDescription="@string/back_to_map"
tools:srcCompat="@drawable/ic_arrow_back" />

<TextView
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:letterSpacing="@dimen/text_button_letter_spacing"
android:textColor="?android:textColorPrimary"
android:textSize="@dimen/default_header_text_size"
app:lineHeight="@dimen/default_title_line_height"
app:typeface="@string/font_roboto_medium"
tools:text="@string/shared_string_toolbar" />

<ImageButton
android:id="@+id/reset_button"
style="@style/Widget.AppCompat.ActionButton"
android:layout_width="@dimen/toolbar_height"
android:layout_height="@dimen/toolbar_height"
android:layout_gravity="center_vertical"
android:contentDescription="@string/reset_to_default"
tools:srcCompat="@drawable/ic_action_reset" />

</LinearLayout>

</LinearLayout>

<LinearLayout
android:id="@+id/main_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:orientation="vertical">

<FrameLayout
android:id="@+id/map_controls_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/content_padding_half"
android:layout_marginBottom="@dimen/content_padding_small_half">

<include
layout="@layout/map_ruler"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="start|bottom" />

<include
layout="@layout/map_hud_controls"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|bottom" />

</FrameLayout>

<View
android:layout_width="match_parent"
android:layout_height="10dp"
android:background="@drawable/bg_contextmenu_shadow_top_light" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/list_background_color"
android:clickable="true"
android:focusable="true"
android:orientation="vertical"
android:padding="@dimen/content_padding">

<LinearLayout
android:id="@+id/main_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clickable="true"
android:focusable="true"
android:orientation="vertical">

</LinearLayout>

<include
android:id="@+id/apply_button"
layout="@layout/bottom_sheet_dialog_button"
android:layout_width="match_parent"
android:layout_height="@dimen/dialog_button_height"
android:layout_marginTop="@dimen/content_padding" />

</LinearLayout>

</LinearLayout>

</FrameLayout>
Loading

0 comments on commit 92eb08e

Please sign in to comment.