drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-27 08:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android][sdk] Move drawables into sdk lib

Browse Source 
Signed-off-by: Andrei Shkrob <github@shkrob.dev>
This commit is contained in:
Andrei Shkrob
2025-06-29 11:26:29 +02:00
committed by Konstantin Pastbin
parent 07420a3f19
commit c600a4fd5d
191 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/app/src/main/java/app/organicmaps/bookmarks/IconsAdapter.java
View File

@@ -41,7 +41,8 @@ public class IconsAdapter extends ArrayAdapter<Icon>
if (icon.getColor() == mCheckedIconColor)
{
circle = Graphics.drawCircleAndImage(getItem(position).argb(), R.dimen.track_circle_size,
R.drawable.ic_bookmark_none, R.dimen.bookmark_icon_size, getContext());
app.organicmaps.sdk.R.drawable.ic_bookmark_none, R.dimen.bookmark_icon_size,
getContext());
}
else
{

2
android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
View File

@@ -142,7 +142,7 @@ public class RoutingPlanController extends ToolbarController
// setupRouterButton(R.id.taxi, R.drawable.ic_taxi, this::onTaxiModeSelected);
setupRouterButton(R.id.transit, R.drawable.ic_transit, this::onTransitModeSelected);
setupRouterButton(R.id.bicycle, R.drawable.ic_bike, this::onBicycleModeSelected);
setupRouterButton(R.id.ruler, R.drawable.ic_ruler_route, this::onRulerModeSelected);
setupRouterButton(R.id.ruler, app.organicmaps.sdk.R.drawable.ic_ruler_route, this::onRulerModeSelected);
}
private void onTransitModeSelected(@NonNull View v)

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

@@ -6,7 +6,7 @@ import androidx.annotation.DrawableRes;
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
@@ -162,10 +162,10 @@ public class BookmarkCategory implements Parcelable
public enum AccessRules
{
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);
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);
private final int mResId;
private final int mDrawableResId;

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

@@ -4,7 +4,7 @@ import android.os.Parcel;
import android.os.Parcelable;
import androidx.annotation.DrawableRes;
import androidx.annotation.IntDef;
import app.organicmaps.R;
import app.organicmaps.sdk.R;
import com.google.common.base.Objects;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;

2
android/app/src/main/java/app/organicmaps/sdk/routing/CarDirection.java
View File

@@ -3,7 +3,7 @@ package app.organicmaps.sdk.routing;
import android.widget.ImageView;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import app.organicmaps.R;
import app.organicmaps.sdk.R;
/**
* IMPORTANT : Order of enum values MUST BE the same as native CarDirection enum.

2
android/app/src/main/java/app/organicmaps/sdk/routing/LaneWay.java
View File

@@ -1,7 +1,7 @@
package app.organicmaps.sdk.routing;
import androidx.annotation.DrawableRes;
import app.organicmaps.R;
import app.organicmaps.sdk.R;
/**
* IMPORTANT : Order of enum values MUST BE the same

2
android/app/src/main/java/app/organicmaps/sdk/routing/PedestrianTurnDirection.java
View File

@@ -3,7 +3,7 @@ package app.organicmaps.sdk.routing;
import android.widget.ImageView;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import app.organicmaps.R;
import app.organicmaps.sdk.R;
public enum PedestrianTurnDirection
{

2
android/app/src/main/java/app/organicmaps/sdk/routing/TransitStepType.java
View File

@@ -1,7 +1,7 @@
package app.organicmaps.sdk.routing;
import androidx.annotation.DrawableRes;
import app.organicmaps.R;
import app.organicmaps.sdk.R;
public enum TransitStepType
{

2
android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
View File

@@ -343,7 +343,7 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
if (mIcon != null)
{
Drawable circle =
Graphics.drawCircleAndImage(mIcon.argb(), R.dimen.track_circle_size, R.drawable.ic_bookmark_none,
Graphics.drawCircleAndImage(mIcon.argb(), R.dimen.track_circle_size, app.organicmaps.sdk.R.drawable.ic_bookmark_none,
R.dimen.bookmark_icon_size, requireContext());
mIvColor.setImageDrawable(circle);
}