[build] Add cache for Desktop UI strings

Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
2026-01-22 19:14:01 +00:00 · 2026-01-22 13:40:00 +01:00
11 changed files with 53 additions and 43 deletions
--- a/.forgejo/workflows/android-beta.yaml
+++ b/.forgejo/workflows/android-beta.yaml
@@ -14,22 +14,22 @@ on:
      - LICENSE
      - NOTICE
      - README.md
-      - android/app/src/fdroid/**
-      - android/app/src/google/**
      - iphone/**
-      - data/*-strings/**
+      - data/strings/**
      - docs/**
      - generator/**
      - packaging/**
-      - libs/platform/*apple*
-      - libs/platform/*_ios*
-      - libs/platform/*_linux*
-      - libs/platform/*_mac*
-      - libs/platform/*qt*
-      - libs/platform/*_win*
-      - libs/pyhelpers/**
+      - platform/*apple*
+      - platform/*_ios*
+      - platform/*_linux* 
+      - platform/*_mac* 
+      - platform/*qt* 
+      - platform/*_win* 
+      - pyhelpers/**
      - qt*/**
+      - skin_generator/**
      - tools/**
+      - track_generator/**
      - xcode/**

 jobs:
--- a/.forgejo/workflows/android-check.yaml
+++ b/.forgejo/workflows/android-check.yaml
@@ -17,19 +17,21 @@ on:
      - android/app/src/fdroid/**
      - android/app/src/google/**
      - iphone/**
-      - data/*-strings/**
+      - data/strings/**
      - docs/**
      - generator/**
      - packaging/**
-      - libs/platform/*apple*
-      - libs/platform/*_ios*
-      - libs/platform/*_linux*
-      - libs/platform/*_mac*
-      - libs/platform/*qt*
-      - libs/platform/*_win*
-      - libs/pyhelpers/**
+      - platform/*apple*
+      - platform/*_ios*
+      - platform/*_linux*
+      - platform/*_mac*
+      - platform/*qt*
+      - platform/*_win*
+      - pyhelpers/**
      - qt*/**
+      - skin_generator/**
      - tools/**
+      - track_generator/**
      - xcode/**

 env:
--- a/.forgejo/workflows/coverage-check.yaml
+++ b/.forgejo/workflows/coverage-check.yaml
@@ -15,12 +15,12 @@ on:
      - README.md
      - docs/**
      - packaging/**
-      - libs/platform/*apple*
-      - libs/platform/*_android*
-      - libs/platform/*_ios*
-      - libs/platform/*_mac*
-      - libs/platform/*_win*
-      - libs/pyhelpers/**
+      - platform/*apple*
+      - platform/*_android*
+      - platform/*_ios*
+      - platform/*_mac*
+      - platform/*_win*
+      - pyhelpers/**
      - tools/**
      - '!tools/python/test_server/**'
      - xcode/**
--- a/.forgejo/workflows/linux-check.yaml
+++ b/.forgejo/workflows/linux-check.yaml
@@ -15,15 +15,15 @@ on:
      - README.md
      - android/**
      - iphone/**
-      - data/*-strings/**
+      - data/strings/**
      - docs/**
      - packaging/**
-      - libs/platform/*apple*
-      - libs/platform/*_android*
-      - libs/platform/*_ios*
-      - libs/platform/*_mac*
-      - libs/platform/*_win*
-      - libs/pyhelpers/**
+      - platform/*apple*
+      - platform/*_android*
+      - platform/*_ios*
+      - platform/*_mac*
+      - platform/*_win*
+      - pyhelpers/**
      - tools/**
      - '!tools/python/test_server/**'
      - xcode/**
--- a/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarkCategoryFragment.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarkCategoryFragment.java
@@ -42,7 +42,7 @@ public class ChooseBookmarkCategoryFragment
  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
  {
    View root = inflater.inflate(R.layout.choose_bookmark_category_fragment, container, false);
-    getDialog().getWindow().setBackgroundDrawableResource(R.drawable.bg_transparent_dlg);
+    getDialog().getWindow().setBackgroundDrawableResource(android.R.color.transparent);
    mRecycler = root.findViewById(R.id.recycler);
    mRecycler.setLayoutManager(new LinearLayoutManager(requireActivity()));
    return root;
--- a/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java
@@ -77,7 +77,7 @@ public class ChooseBookmarksSortingTypeFragment
  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
  {
    super.onViewCreated(view, savedInstanceState);
-    getDialog().getWindow().setBackgroundDrawableResource(R.drawable.bg_transparent_dlg);
+    getDialog().getWindow().setBackgroundDrawableResource(android.R.color.transparent);

    final Bundle args = getArguments();
    if (args == null)
--- a/android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java
+++ b/android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java
@@ -61,7 +61,7 @@ public class StackedButtonsDialog extends AppCompatDialog implements View.OnClic
    setCancelable(mCancelable);
    setOnCancelListener(mCancelListener);
    setContentView(R.layout.dialog_stacked_buttons);
-    getWindow().setBackgroundDrawableResource(R.drawable.bg_transparent_dlg);
+    getWindow().setBackgroundDrawableResource(android.R.color.transparent);

    TextView title = findViewById(R.id.tv__title);
    UiUtils.setTextAndHideIfEmpty(title, mTitle);
--- a/android/app/src/main/res/drawable/bg_transparent_dlg.xml
+++ b/android/app/src/main/res/drawable/bg_transparent_dlg.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@android:color/transparent"/>
-    <corners android:radius="28dp"/>
-</shape>
--- a/configure.sh
+++ b/configure.sh
@@ -8,9 +8,11 @@ echo "Configuring the repository for development..."
 SKIP_MAP_DOWNLOAD="${SKIP_MAP_DOWNLOAD:-}"
 SKIP_GENERATE_SYMBOLS="${SKIP_GENERATE_SYMBOLS:-}"
 SKIP_GENERATE_DRULES="${SKIP_GENERATE_DRULES:-}"
+SKIP_GENERATE_STRINGS="${SKIP_GENERATE_STRINGS:-}"

 DRULES_NOT_GENERATED=
 SYMBOLS_NOT_GENERATED=
+STRINGS_NOT_GENERATED=

 DRULES_FILES=(drules_proto.bin drules_proto_default_dark.bin drules_proto_default_light.bin drules_proto_outdoors_dark.bin drules_proto_outdoors_light.bin drules_proto_vehicle_dark.bin drules_proto_vehicle_light.bin classificator.txt types.txt visibility.txt colors.txt patterns.txt)
 SYMBOLS_FILES=(xhdpi/light/symbols.png xhdpi/light/symbols.sdf xhdpi/dark/symbols.png xhdpi/dark/symbols.sdf mdpi/light/symbols.png mdpi/light/symbols.sdf mdpi/dark/symbols.png mdpi/dark/symbols.sdf 6plus/light/symbols.png 6plus/light/symbols.sdf 6plus/dark/symbols.png 6plus/dark/symbols.sdf xxxhdpi/light/symbols.png xxxhdpi/light/symbols.sdf xxxhdpi/dark/symbols.png xxxhdpi/dark/symbols.sdf hdpi/light/symbols.png hdpi/light/symbols.sdf hdpi/dark/symbols.png hdpi/dark/symbols.sdf xxhdpi/light/symbols.png xxhdpi/light/symbols.sdf xxhdpi/dark/symbols.png xxhdpi/dark/symbols.sdf)
@@ -29,6 +31,11 @@ for f in ${SYMBOLS_FILES[*]}; do
  fi
 done

+if [ ! -f "libs/indexer/localized_types_map.cpp" ]; then
+  STRINGS_NOT_GENERATED=1
+  break
+fi
+
 ############################# PROCESS OPTIONS ################################

 TEMP=$(getopt -o ms --long skip-map-download,skip-generate-symbols,skip-generate-drules \
@@ -43,6 +50,7 @@ while true; do
    -m | --skip-map-download ) SKIP_MAP_DOWNLOAD=1; shift ;;
    -s | --skip-generate-symbols ) SKIP_GENERATE_SYMBOLS=1; shift ;;
    -d | --skip-generate-drules ) SKIP_GENERATE_DRULES=1; shift ;;
+    -S | --skip-generate-strings ) SKIP_GENERATE_STRINGS=1; shift ;;
    * ) break ;;
  esac
 done
@@ -116,8 +124,14 @@ fi
 echo "Generating search categories / synonyms..."
 ./tools/unix/generate_categories.sh

-echo "Generating Desktop UI strings..."
-./tools/unix/generate_desktop_ui_strings.sh
+if [ -z "$SKIP_GENERATE_STRINGS" ]; then
+  if Diff data/strings_hash iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings || [ ! -z "$STRINGS_NOT_GENERATED" ]; then
+    echo "Generating Desktop UI strings..."
+    ./tools/unix/generate_desktop_ui_strings.sh
+  fi
+else
+  echo "Skipping generate Desktop UI strings..."
+fi

 if [ -z "$SKIP_GENERATE_SYMBOLS" ]; then
  if Diff data/symbols_hash data/styles/*/*/symbols/* || [ ! -z "$SYMBOLS_NOT_GENERATED" ]; then
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -1293,7 +1293,7 @@ node|z17-[leisure=fitness_station]
 node|z16-[leisure=sports_centre],
 {icon-image: sports_centre-m.svg;icon-min-distance: 9;}
 node|z17-[leisure=sports_hall]
-{icon-image: pitch-m.svg;icon-min-distance: 10;}
+{icon-image: sports_centre-m.svg;icon-min-distance: 10;}
 node|z16-[leisure=dance]
 {icon-image: dance-m.svg;icon-min-distance: 10;}
 node|z16-[leisure=fitness_centre]
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
@@ -1402,7 +1402,6 @@
 "type.shop.watches" = "Watch Shop";
 "type.shop.wholesale" = "Wholesale Shop";
 "type.sport" = "Sport";
-"type.sport.multi" = "Various Sports";
 "type.sport.9pin" = "Bowling";
 "type.sport.10pin" = "Bowling";
 "type.sport.american_football" = "American Football";