[build] Add cache for Desktop UI strings

Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>

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;

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)

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);

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>

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

data/styles/default/dark/symbols/arrow-m.svg

@@ -1 +1,3 @@
-<svg height="7" viewBox="0 0 17 7" width="17" xmlns="http://www.w3.org/2000/svg"><path d="m6.40838857 2.28571429h9.59161903v1.52380952h-9.60838093l.46566857 2.28571429-6.85714286-3.04761905 6.85714286-3.04761905-.44892191 2.28571429z" fill="#fff" fill-opacity=".6" fill-rule="evenodd" transform="matrix(-1 0 0 1 16.908 .6667)"/></svg>
+<svg version="1.1" viewBox="0 0 21 8" width="16" height="6" xmlns="http://www.w3.org/2000/svg">
+ <path transform="matrix(-1 0 0 1 21 0)" d="m8.4108 3h12.589v2h-12.611l0.61119 3-9-4 9-4-0.58921 3z" fill="#FFF" fill-rule="evenodd" opacity=".6"/>
+</svg>

data/styles/default/dark/symbols/arrow-s.svg

@@ -1 +1,3 @@
-<svg height="5" viewBox="0 0 12 5" width="12" xmlns="http://www.w3.org/2000/svg"><path d="m4.47597333 1.46666667h6.52402667v.73333333h-6.52967333l.15649333 1.46666667-4.62682-1.83333334 4.62682-1.83333333-.15086133 1.46666667z" fill="#fff" fill-opacity=".6" fill-rule="evenodd" transform="matrix(-1 0 0 1 11.9078 .6667)"/></svg>
+<svg version="1.1" viewBox="0 0 15 5" width="11" height="4" xmlns="http://www.w3.org/2000/svg">
+ <path transform="matrix(-1 0 0 1 15 0)" d="m6.1036 2h8.8964v1h-8.9041l0.2134 2-6.3093-2.5 6.3093-2.5-0.20572 2z" fill="#FFF" fill-rule="evenodd" opacity=".6"/>
+</svg>

data/styles/default/dark/symbols/arrow-xs.svg

@@ -1 +1,3 @@
-<svg height="3" viewBox="0 0 8 3" width="8" xmlns="http://www.w3.org/2000/svg"><path d="m1.94444444.77777778h5.05555556v.77777778h-5.05555556zm-1.94444444.38888889 1.94444444-1.16666667v2.33333333z" fill="#fff" fill-opacity=".6" fill-rule="evenodd" transform="matrix(-1 0 0 1 7.9078 .6667)"/></svg>
+<svg version="1.1" viewBox="0 0 9 3" width="7" height="2" xmlns="http://www.w3.org/2000/svg">
+ <path transform="matrix(-1 0 0 1 9 0)" d="m2.5 1h6.5v1h-6.5v-1zm-2.5 0.5 2.5-1.5v3l-2.5-1.5z" fill="#FFF" fill-rule="evenodd" opacity=".6"/>
+</svg>

data/styles/default/light/symbols/arrow-m.svg

@@ -1 +1,3 @@
-<svg height="7" viewBox="0 0 16 7" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m6.40838857 2.28571429h9.59161903v1.52380952h-9.60838093l.46566857 2.28571429-6.85714286-3.04761905 6.85714286-3.04761905-.44892191 2.28571429z" fill="#46361e" fill-opacity=".4" fill-rule="evenodd" transform="matrix(-1 0 0 1 16.0002 0)"/></svg>
+<svg version="1.1" viewBox="0 0 21 8" width="16" height="6" xmlns="http://www.w3.org/2000/svg">
+ <path transform="matrix(-1 0 0 1 21 0)" d="m8.4108 3h12.589v2h-12.611l0.61119 3-9-4 9-4-0.58921 3z" fill="#747E86" fill-rule="evenodd"/>
+</svg>

data/styles/default/light/symbols/arrow-s.svg

@@ -1 +1,3 @@
-<svg height="4" viewBox="0 0 11 4" width="11" xmlns="http://www.w3.org/2000/svg"><path d="m4.47597333 1.46666667h6.52402667v.73333333h-6.52967333l.15649333 1.46666667-4.62682-1.83333334 4.62682-1.83333333-.15086133 1.46666667z" fill="#46361e" fill-opacity=".4" fill-rule="evenodd" transform="matrix(-1 0 0 1 11 0)"/></svg>
+<svg version="1.1" viewBox="0 0 15 5" width="11" height="4" xmlns="http://www.w3.org/2000/svg">
+ <path transform="matrix(-1 0 0 1 15 0)" d="m6.1036 2h8.8964v1h-8.9041l0.2134 2-6.3093-2.5 6.3093-2.5-0.20572 2z" fill="#747E86" fill-rule="evenodd"/>
+</svg>

data/styles/default/light/symbols/arrow-xs.svg

@@ -1 +1,3 @@
-<svg height="3" viewBox="0 0 7 3" width="7" xmlns="http://www.w3.org/2000/svg"><path d="m1.94444444.77777778h5.05555556v.77777778h-5.05555556zm-1.94444444.38888889 1.94444444-1.16666667v2.33333333z" fill="#46361e" fill-opacity=".4" fill-rule="evenodd" transform="matrix(-1 0 0 1 7 0)"/></svg>
+<svg version="1.1" viewBox="0 0 9 3" width="7" height="2" xmlns="http://www.w3.org/2000/svg">
+ <path transform="matrix(-1 0 0 1 9 0)" d="m2.5 1h6.5v1h-6.5v-1zm-2.5 0.5 2.5-1.5v3l-2.5-1.5z" fill="#747E86" fill-rule="evenodd"/>
+</svg>