Skip to content

Commit

Permalink
Merge branch 'osmandapp:master' into hardy_Afa
Browse files Browse the repository at this point in the history
  • Loading branch information
@sonora
sonora authored Jun 11, 2024
2 parents cfbcac6 + d1a785d commit 646da7b
Show file tree
Hide file tree
Showing 35 changed files with 596 additions and 295 deletions.
2 changes: 2 additions & 0 deletions OsmAnd-java/src/main/java/net/osmand/IndexConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ public class IndexConstants {
public static final String AVOID_ROADS_FILE_EXT = ".geojson";

public static final String OBJ_FILE_EXT = ".obj";
public static final String TXT_EXT = ".txt";

public static final String POI_TABLE = "poi";

Expand Down Expand Up @@ -109,4 +110,5 @@ public class IndexConstants {

public static final String VOICE_PROVIDER_SUFFIX = "-tts";
public static final String MODEL_NAME_PREFIX = "model_";
public static final String COLOR_PALETTE_DIR = "color-palette/";
}
1 change: 1 addition & 0 deletions OsmAnd/assets/bundled_assets.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@
<asset source="color-palette/hillshade_color_default.txt" destination="color-palette/hillshade_color_default.txt" mode="copyOnlyIfDoesNotExist" />
<asset source="color-palette/hillshade_main_default.txt" destination="color-palette/hillshade_main_default.txt" mode="copyOnlyIfDoesNotExist" />
<asset source="color-palette/slope_default.txt" destination="color-palette/slope_default.txt" mode="copyOnlyIfDoesNotExist" />
<asset source="color-palette/height_altitude_default.txt" destination="color-palette/height_altitude_default.txt" mode="copyOnlyIfDoesNotExist" />
<asset source="color-palette/weather_cloud.txt" destination="color-palette/weather_cloud.txt" mode="copyOnlyIfDoesNotExist" />
<asset source="color-palette/weather_precip.txt" destination="color-palette/weather_precip.txt" mode="copyOnlyIfDoesNotExist" />
<asset source="color-palette/weather_pressure.txt" destination="color-palette/weather_pressure.txt" mode="copyOnlyIfDoesNotExist" />
Expand Down
49 changes: 3 additions & 46 deletions OsmAnd/res/layout/bottom_sheet_item_with_descr_and_checkbox_56dp.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,60 +5,17 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:gravity="center_vertical"
android:paddingLeft="@dimen/content_padding"
android:paddingRight="@dimen/content_padding"
android:paddingEnd="@dimen/content_padding"
android:paddingStart="@dimen/content_padding"
android:paddingTop="@dimen/context_menu_padding_margin_medium"
android:paddingBottom="@dimen/context_menu_padding_margin_medium">
android:gravity="center_vertical">

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/icon"
android:layout_width="@dimen/standard_icon_size"
android:layout_height="@dimen/standard_icon_size"
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/content_padding"
android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
android:layout_marginRight="@dimen/bottom_sheet_icon_margin"
tools:src="@drawable/list_destination"/>

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:orientation="vertical">

<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:textAppearance="@style/TextAppearance.ListItemTitle"
tools:text="Some title"/>

<TextView
android:id="@+id/description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
android:textColor="@null"
tools:text="Some description"/>
</LinearLayout>

<androidx.appcompat.widget.AppCompatCheckBox
android:id="@+id/compound_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="@dimen/bottom_sheet_content_margin"
android:layout_marginStart="@dimen/bottom_sheet_content_margin"
android:background="@null"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"/>
<include layout="@layout/bottom_sheet_item_with_descr_and_checkbox_content_56dp" />

</LinearLayout>
33 changes: 33 additions & 0 deletions OsmAnd/res/layout/bottom_sheet_item_with_descr_and_checkbox_and_divider_56dp.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:gravity="center_vertical"
android:orientation="horizontal">

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/icon"
android:layout_width="@dimen/standard_icon_size"
android:layout_height="@dimen/standard_icon_size"
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/content_padding"
android:layout_marginEnd="@dimen/bottom_sheet_icon_margin"
tools:src="@drawable/list_destination" />

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">

<include layout="@layout/bottom_sheet_item_with_descr_and_checkbox_content_56dp" />

<include
android:id="@+id/divider_bottom"
layout="@layout/simple_divider_item" />

</LinearLayout>

</LinearLayout>
50 changes: 50 additions & 0 deletions OsmAnd/res/layout/bottom_sheet_item_with_descr_and_checkbox_content_56dp.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingStart="0dp"
android:paddingEnd="@dimen/content_padding"
android:paddingTop="@dimen/context_menu_padding_margin_medium"
android:paddingBottom="@dimen/context_menu_padding_margin_medium">

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:orientation="vertical">

<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:textAppearance="@style/TextAppearance.ListItemTitle"
tools:text="Some title" />

<TextView
android:id="@+id/description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:textAppearance="@style/TextAppearance.ContextMenuSubtitle"
android:textColor="@null"
tools:text="Some description" />

</LinearLayout>

<androidx.appcompat.widget.AppCompatCheckBox
android:id="@+id/compound_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="@dimen/bottom_sheet_content_margin"
android:background="@null"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false" />

</LinearLayout>
4 changes: 3 additions & 1 deletion OsmAnd/res/values-b+sr+Latn/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3802,7 +3802,7 @@
<string name="sit_on_the_stop">Ukrcavanje na stanici</string>
<string name="exit_at">Izlaz na</string>
<string name="routeInfo_road_types_name">Vrste puteva</string>
<string name="step_by_step">Manevri</string>
<string name="step_by_step">Skretanje-po-skretanje</string>
<string name="by_transport_type">Do %1$s</string>
<string name="time_of_day">Doba dana</string>
<string name="use_osm_live_public_transport">Javni prevoz OsmAnd Live</string>
Expand Down Expand Up @@ -5750,4 +5750,6 @@
<string name="key_assignment_add_action">Dodaj akciju</string>
<string name="action_icon">Dodaj ikonu</string>
<string name="assigned_keys">Dodeljenja tastera</string>
<string name="user_palette">Korisnička paleta</string>
<string name="shared_string_colors">Boje</string>
</resources>
2 changes: 2 additions & 0 deletions OsmAnd/res/values-da/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5749,4 +5749,6 @@
<string name="no_assigned_keys_desc">Vælg en handling, og tildel en tast ved at trykke på knappen \'Tilføj\'.</string>
<string name="no_assigned_keys">Ingen tildelte taster</string>
<string name="shared_string_key">Tast</string>
<string name="user_palette">Brugerpalet</string>
<string name="shared_string_colors">Farver</string>
</resources>
Loading

0 comments on commit 646da7b

Please sign in to comment.