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 Apr 19, 2024
2 parents fcd5d9d + f541b8b commit 186cde3
Show file tree
Hide file tree
Showing 26 changed files with 210 additions and 125 deletions.
10 changes: 5 additions & 5 deletions OsmAnd-java/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ configurations {
android
}

tasks.withType(JavaCompile) {
sourceCompatibility = "1.7"
targetCompatibility = "1.7"
options.encoding = 'UTF-8'
}
//tasks.withType(JavaCompile) {
// sourceCompatibility = "1.7"
// targetCompatibility = "1.7"
// options.encoding = 'UTF-8'
//}

task collectRoutingResources(type: Sync) {
from "../../resources/routing"
Expand Down
2 changes: 1 addition & 1 deletion OsmAnd-java/src/main/java/net/osmand/gpx/GPXUtilities.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ void updatePoint(WptPt pt) {
this.name = pt.name;
this.category = pt.category;

Map<String, String> extensions = getExtensionsToRead();
Map<String, String> extensions = pt.getExtensionsToRead();
String color = extensions.get(COLOR_NAME_EXTENSION);
if (color != null) {
setColor(color);
Expand Down
2 changes: 1 addition & 1 deletion OsmAnd-java/src/main/java/net/osmand/osm/AbstractPoiType.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public String getSynonyms() {
}

public String getEnTranslation() {
if(enTranslation == null) {
if (enTranslation == null) {
enTranslation = registry.getEnTranslation(this);
}
return enTranslation;
Expand Down
5 changes: 3 additions & 2 deletions OsmAnd/build-common.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ task printc {
}

android {
compileSdk 33
buildToolsVersion = "33.0.2"
compileSdk 34
buildToolsVersion = "34.0.0"
// compileNdkVersion "android-ndk-r17b"

defaultConfig {
Expand Down Expand Up @@ -343,6 +343,7 @@ dependencies {
implementation 'com.google.android.material:material:1.9.0'
implementation 'androidx.browser:browser:1.0.0'
implementation 'androidx.preference:preference:1.1.0'
implementation 'androidx.lifecycle:lifecycle-process:2.7.0'
implementation fileTree(include: ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs')

implementation group: 'commons-logging', name: 'commons-logging', version: '1.2'
Expand Down
2 changes: 1 addition & 1 deletion OsmAnd/build-library.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ apply plugin: 'kotlin-android'
android {

defaultConfig {
minSdkVersion 21
minSdkVersion 24
}

lintOptions {
Expand Down
2 changes: 1 addition & 1 deletion OsmAnd/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ android {
}

defaultConfig {
minSdkVersion 23
minSdkVersion 24
versionCode 4800
versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode
versionName "4.8.0"
Expand Down
34 changes: 20 additions & 14 deletions OsmAnd/res/layout-v26/simple_map_widget_large.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
android:id="@+id/widget_bg"
android:layout_width="match_parent"
android:layout_height="@dimen/simple_widget_large_height"
android:paddingTop="6dp"
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:orientation="vertical">
android:paddingTop="6dp"
android:paddingBottom="3dp">

<LinearLayout
android:id="@+id/container"
Expand All @@ -18,35 +19,40 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="17dp"
android:orientation="horizontal"
android:gravity="bottom">
android:gravity="bottom"
android:layoutDirection="rtl"
android:orientation="horizontal">

<TextView
android:id="@+id/widget_name"
android:layout_width="0dp"
android:id="@+id/widget_text_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:gravity="bottom|end"
android:includeFontPadding="false"
android:letterSpacing="0.06"
android:lineSpacingExtra="-2sp"
android:maxLines="1"
android:textAllCaps="true"
android:textColor="@color/text_color_secondary_light"
android:textSize="@dimen/simple_widget_description_text_size"
tools:text="Widget name" />
tools:text="Unit" />

<TextView
android:id="@+id/widget_text_small"
android:layout_width="wrap_content"
android:id="@+id/widget_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="bottom|start"
android:layout_marginStart="3dp"
android:layout_weight="1"
android:ellipsize="end"
android:includeFontPadding="false"
android:letterSpacing="0.06"
android:lineSpacingExtra="-2sp"
android:maxLines="1"
android:textAllCaps="true"
android:textColor="@color/text_color_secondary_light"
android:textSize="@dimen/simple_widget_description_text_size"
tools:text="Unit" />
tools:text="Widget name" />

</LinearLayout>

Expand All @@ -72,9 +78,9 @@
android:autoSizeTextType="uniform"
android:ellipsize="none"
android:gravity="center_vertical|start"
android:includeFontPadding="false"
android:letterSpacing="0.04"
android:maxLines="1"
android:includeFontPadding="false"
android:textColor="@color/text_color_primary_light"
android:textSize="@dimen/simple_widget_value_large_size" />

Expand Down
35 changes: 19 additions & 16 deletions OsmAnd/res/layout-v26/simple_map_widget_medium.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
android:layout_height="@dimen/simple_widget_medium_height"
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:paddingVertical="6dp">
android:paddingTop="6dp"
android:paddingBottom="3dp">

<LinearLayout
android:id="@+id/container"
Expand All @@ -20,43 +21,45 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="17dp"
android:layoutDirection="rtl"
android:orientation="horizontal">

<TextView
android:id="@+id/widget_name"
android:layout_width="0dp"
android:id="@+id/widget_text_small"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:ellipsize="end"
android:gravity="bottom"
android:layout_marginEnd="3dp"
android:gravity="bottom|end"
android:includeFontPadding="false"
android:letterSpacing="0.06"
android:lineSpacingExtra="-2sp"
android:maxLines="1"
android:textAllCaps="true"
android:textColor="@color/text_color_secondary_light"
android:textSize="@dimen/simple_widget_description_text_size"
tools:text="Widget name" />
tools:text="Unit" />

<TextView
android:id="@+id/widget_text_small"
android:layout_width="wrap_content"
android:id="@+id/widget_name"
android:layout_width="0dp"
android:layout_height="match_parent"
android:gravity="bottom"
android:layout_weight="1"
android:ellipsize="end"
android:gravity="bottom|start"
android:includeFontPadding="false"
android:letterSpacing="0.06"
android:lineSpacingExtra="-2sp"
android:maxLines="1"
android:textAllCaps="true"
android:textColor="@color/text_color_secondary_light"
android:textSize="@dimen/simple_widget_description_text_size"
tools:text="Unit" />
</LinearLayout>
tools:text="Widget name" />

</LinearLayout>

<FrameLayout
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginTop="3dp"
android:layout_height="46dp"
android:orientation="horizontal">

<androidx.appcompat.widget.AppCompatImageView
Expand All @@ -75,9 +78,9 @@
android:autoSizeMinTextSize="@dimen/simple_widget_value_minimum_size"
android:autoSizeStepGranularity="2sp"
android:autoSizeTextType="uniform"
android:includeFontPadding="false"
android:ellipsize="none"
android:gravity="center_vertical|start"
android:includeFontPadding="false"
android:letterSpacing="0.04"
android:maxLines="1"
android:textColor="@color/text_color_primary_light"
Expand Down
3 changes: 3 additions & 0 deletions OsmAnd/res/layout-v26/simple_map_widget_small_full.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
android:autoSizeStepGranularity="2sp"
android:autoSizeTextType="uniform"
android:gravity="center_vertical|start"
android:includeFontPadding="false"
android:maxLines="1"
android:textColor="@color/text_color_primary_light"
android:textSize="@dimen/simple_widget_value_small_size"
Expand All @@ -55,6 +56,7 @@
android:layout_height="wrap_content"
android:layout_gravity="end"
android:ellipsize="end"
android:includeFontPadding="false"
android:letterSpacing="0.06"
android:lineSpacingExtra="-2sp"
android:maxLines="1"
Expand All @@ -68,6 +70,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:includeFontPadding="false"
android:letterSpacing="0.06"
android:lineSpacingExtra="-2sp"
android:maxLines="1"
Expand Down
59 changes: 27 additions & 32 deletions OsmAnd/res/layout/simple_map_widget_large.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,63 +6,57 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="@dimen/simple_widget_large_height"
android:orientation="vertical">
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:paddingTop="6dp"
android:paddingBottom="3dp">

<LinearLayout
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:paddingVertical="10dp">
android:orientation="vertical">

<androidx.constraintlayout.widget.ConstraintLayout
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="17dp"
android:layoutDirection="rtl"
android:orientation="horizontal">

<TextView
android:id="@+id/widget_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:ellipsize="end"
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/widget_text_small"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="end|bottom"
android:letterSpacing="0.06"
android:lineSpacingExtra="-2sp"
android:maxLines="1"
android:textAllCaps="true"
android:textColor="@color/text_color_secondary_light"
android:textSize="@dimen/simple_widget_description_text_size"
tools:text="Unit" />

osmand:layout_constrainedWidth="true"
osmand:layout_constraintBottom_toBottomOf="parent"
osmand:layout_constraintEnd_toStartOf="@+id/widget_text_small"
osmand:layout_constraintHorizontal_bias="0.0"
osmand:layout_constraintHorizontal_chainStyle="packed"
osmand:layout_constraintStart_toStartOf="parent"
osmand:layout_constraintTop_toTopOf="parent"
tools:text="Widget name" />

<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/widget_text_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
<TextView
android:id="@+id/widget_name"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginEnd="8dp"
android:layout_weight="1"
android:ellipsize="end"
android:gravity="start|bottom"
android:letterSpacing="0.06"
android:lineSpacingExtra="-2sp"
android:maxLines="1"
android:textAllCaps="true"
android:textColor="@color/text_color_secondary_light"
android:textSize="@dimen/simple_widget_description_text_size"
tools:text="Widget name" />

osmand:layout_constraintBottom_toBottomOf="parent"
osmand:layout_constraintEnd_toEndOf="parent"
osmand:layout_constraintTop_toTopOf="parent"
tools:text="Unit" />

</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>

<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="70dp">

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/widget_icon"
Expand All @@ -79,6 +73,7 @@
android:layout_gravity="center"
android:layout_marginHorizontal="36dp"
android:gravity="center"
android:includeFontPadding="false"
android:letterSpacing="0.04"
android:maxLines="1"
android:textColor="@color/text_color_primary_light"
Expand Down
Loading

0 comments on commit 186cde3

Please sign in to comment.