drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-19 04:53:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android][sdk] Replace app.organicmaps.R with app.organicmaps.sdk.R

Browse Source 
Signed-off-by: Andrei Shkrob <github@shkrob.dev>
This commit is contained in:
Andrei Shkrob
2025-08-15 15:19:29 +02:00
committed by Konstantin Pastbin
parent 3a90f9783d
commit abcc95710d
12 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/sdk/src/main/java/app/organicmaps/sdk/Map.java
View File

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

3
android/sdk/src/main/java/app/organicmaps/sdk/OrganicMaps.java
View File

@@ -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.

8
android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategory.java
View File

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

3
android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
View File

@@ -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
}
}

1
android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java
View File

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

2
android/sdk/src/main/java/app/organicmaps/sdk/maplayer/subway/TransitSchemeState.java
View File

@@ -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
{

2
android/sdk/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java
View File

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

2
android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java
View File

@@ -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
{

2
android/sdk/src/main/java/app/organicmaps/sdk/util/Distance.java
View File

@@ -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

2
android/sdk/src/main/java/app/organicmaps/sdk/util/SharedPropertiesUtils.java
View File

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

2
android/sdk/src/main/java/app/organicmaps/sdk/util/StringUtils.java
View File

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

2
android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java
View File

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