From abcc95710df01e1620d7d85057bd05fb024426b1 Mon Sep 17 00:00:00 2001 From: Andrei Shkrob Date: Fri, 15 Aug 2025 15:19:29 +0200 Subject: [PATCH] [android][sdk] Replace app.organicmaps.R with app.organicmaps.sdk.R Signed-off-by: Andrei Shkrob --- android/sdk/src/main/java/app/organicmaps/sdk/Map.java | 1 - .../src/main/java/app/organicmaps/sdk/OrganicMaps.java | 3 +-- .../organicmaps/sdk/bookmarks/data/BookmarkCategory.java | 8 ++++---- .../java/app/organicmaps/sdk/bookmarks/data/Icon.java | 3 ++- .../src/main/java/app/organicmaps/sdk/maplayer/Mode.java | 1 + .../sdk/maplayer/subway/TransitSchemeState.java | 2 +- .../app/organicmaps/sdk/settings/StoragePathManager.java | 2 +- .../src/main/java/app/organicmaps/sdk/util/Config.java | 2 +- .../src/main/java/app/organicmaps/sdk/util/Distance.java | 2 +- .../app/organicmaps/sdk/util/SharedPropertiesUtils.java | 2 +- .../main/java/app/organicmaps/sdk/util/StringUtils.java | 2 +- .../java/app/organicmaps/sdk/util/log/LogsManager.java | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/Map.java b/android/sdk/src/main/java/app/organicmaps/sdk/Map.java index b31eb00b0..a60c3976e 100644 --- a/android/sdk/src/main/java/app/organicmaps/sdk/Map.java +++ b/android/sdk/src/main/java/app/organicmaps/sdk/Map.java @@ -6,7 +6,6 @@ import android.view.MotionEvent; import android.view.Surface; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import app.organicmaps.R; import app.organicmaps.sdk.display.DisplayType; import app.organicmaps.sdk.location.LocationHelper; import app.organicmaps.sdk.util.Config; diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/OrganicMaps.java b/android/sdk/src/main/java/app/organicmaps/sdk/OrganicMaps.java index 14b3f730c..dfa0cbc36 100644 --- a/android/sdk/src/main/java/app/organicmaps/sdk/OrganicMaps.java +++ b/android/sdk/src/main/java/app/organicmaps/sdk/OrganicMaps.java @@ -6,7 +6,6 @@ import androidx.annotation.NonNull; import androidx.lifecycle.DefaultLifecycleObserver; import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.ProcessLifecycleOwner; -import app.organicmaps.R; import app.organicmaps.sdk.bookmarks.data.BookmarkManager; import app.organicmaps.sdk.bookmarks.data.Icon; import app.organicmaps.sdk.downloader.Android7RootCertificateWorkaround; @@ -82,7 +81,7 @@ public final class OrganicMaps implements DefaultLifecycleObserver { mFlavor = flavor; mContext = context.getApplicationContext(); - mPreferences = mContext.getSharedPreferences(context.getString(app.organicmaps.sdk.R.string.pref_file_name), + mPreferences = mContext.getSharedPreferences(context.getString(R.string.pref_file_name), Context.MODE_PRIVATE); // Set configuration directory as early as possible. diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategory.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategory.java index d4fe68208..8c8eb89c3 100644 --- a/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategory.java +++ b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategory.java @@ -162,10 +162,10 @@ public class BookmarkCategory implements Parcelable public enum AccessRules { - ACCESS_RULES_LOCAL(app.organicmaps.R.string.not_shared, R.drawable.ic_lock), - ACCESS_RULES_PUBLIC(app.organicmaps.R.string.public_access, R.drawable.ic_public_inline), - ACCESS_RULES_DIRECT_LINK(app.organicmaps.R.string.limited_access, R.drawable.ic_link_inline), - ACCESS_RULES_AUTHOR_ONLY(app.organicmaps.R.string.access_rules_author_only, R.drawable.ic_lock); + ACCESS_RULES_LOCAL(R.string.not_shared, R.drawable.ic_lock), + ACCESS_RULES_PUBLIC(R.string.public_access, R.drawable.ic_public_inline), + ACCESS_RULES_DIRECT_LINK(R.string.limited_access, R.drawable.ic_link_inline), + ACCESS_RULES_AUTHOR_ONLY(R.string.access_rules_author_only, R.drawable.ic_lock); private final int mResId; private final int mDrawableResId; diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java index 04f1667f8..28b2c8506 100644 --- a/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java +++ b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java @@ -7,6 +7,7 @@ import androidx.annotation.ColorInt; import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import app.organicmaps.sdk.BuildConfig; +import app.organicmaps.sdk.R; import app.organicmaps.sdk.util.StringUtils; import app.organicmaps.sdk.util.log.Logger; import dalvik.annotation.optimization.FastNative; @@ -115,7 +116,7 @@ public class Icon implements Parcelable // Force devs to add an icon for each bookmark type. if (BuildConfig.DEBUG) throw new RuntimeException("Error getting icon for " + name); - icons[i] = app.organicmaps.sdk.R.drawable.ic_bookmark_none; // Fallback icon + icons[i] = R.drawable.ic_bookmark_none; // Fallback icon } } diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java index 3ed242cff..77023479a 100644 --- a/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java +++ b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java @@ -2,6 +2,7 @@ package app.organicmaps.sdk.maplayer; import android.content.Context; import androidx.annotation.NonNull; +import app.organicmaps.sdk.R; import app.organicmaps.sdk.Framework; import app.organicmaps.sdk.maplayer.isolines.IsolinesManager; import app.organicmaps.sdk.maplayer.subway.SubwayManager; diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/subway/TransitSchemeState.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/subway/TransitSchemeState.java index 08bbc95a7..cc78c01fa 100644 --- a/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/subway/TransitSchemeState.java +++ b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/subway/TransitSchemeState.java @@ -3,7 +3,7 @@ package app.organicmaps.sdk.maplayer.subway; import android.content.Context; import android.widget.Toast; import androidx.annotation.NonNull; -import app.organicmaps.R; +import app.organicmaps.sdk.R; enum TransitSchemeState { diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java index 5164f1088..0eb5bf3bf 100644 --- a/android/sdk/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java +++ b/android/sdk/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java @@ -11,7 +11,7 @@ import android.os.storage.StorageVolume; import android.text.TextUtils; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import app.organicmaps.R; +import app.organicmaps.sdk.R; import app.organicmaps.sdk.Framework; import app.organicmaps.sdk.downloader.MapManager; import app.organicmaps.sdk.util.Config; diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java index 44326e4c1..9187b7988 100644 --- a/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java +++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java @@ -5,7 +5,7 @@ import android.content.SharedPreferences; import android.os.Build; import androidx.annotation.NonNull; import androidx.preference.PreferenceManager; -import app.organicmaps.R; +import app.organicmaps.sdk.R; public final class Config { diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/Distance.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/Distance.java index a846e16ff..bb1b4ee39 100644 --- a/android/sdk/src/main/java/app/organicmaps/sdk/util/Distance.java +++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/Distance.java @@ -4,7 +4,7 @@ import android.content.Context; import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.StringRes; -import app.organicmaps.R; +import app.organicmaps.sdk.R; // Used by JNI. @Keep diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/SharedPropertiesUtils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/SharedPropertiesUtils.java index 6a28b6163..6de3845c0 100644 --- a/android/sdk/src/main/java/app/organicmaps/sdk/util/SharedPropertiesUtils.java +++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/SharedPropertiesUtils.java @@ -5,7 +5,7 @@ import static app.organicmaps.sdk.util.Config.KEY_PREF_STATISTICS; import android.content.Context; import android.content.SharedPreferences; import androidx.annotation.NonNull; -import app.organicmaps.R; +import app.organicmaps.sdk.R; import app.organicmaps.sdk.maplayer.Mode; import java.io.IOException; import java.util.Locale; diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/StringUtils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/StringUtils.java index ca0ce167b..0c60b0731 100644 --- a/android/sdk/src/main/java/app/organicmaps/sdk/util/StringUtils.java +++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/StringUtils.java @@ -5,7 +5,7 @@ import android.text.Editable; import android.text.TextWatcher; import android.util.Pair; import androidx.annotation.NonNull; -import app.organicmaps.R; +import app.organicmaps.sdk.R; import java.text.NumberFormat; import java.util.Locale; diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java index 50b915ecb..64a1e1c0a 100644 --- a/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java +++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java @@ -16,7 +16,7 @@ import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import app.organicmaps.R; +import app.organicmaps.sdk.R; import app.organicmaps.sdk.BuildConfig; import app.organicmaps.sdk.util.Config; import app.organicmaps.sdk.util.ROMUtils;