[android][sdk] Move drawables into sdk lib

Signed-off-by: Andrei Shkrob <github@shkrob.dev>

android/app/build.gradle

@@ -413,3 +413,7 @@ huaweiPublish {
     }
   }
 }
+
+tasks.withType(JavaCompile).configureEach {
+  options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation'
+}

android/app/src/main/java/app/organicmaps/bookmarks/IconsAdapter.java

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

android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java

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

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

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

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

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

android/app/src/main/java/app/organicmaps/sdk/routing/CarDirection.java

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

android/app/src/main/java/app/organicmaps/sdk/routing/LaneWay.java

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

android/app/src/main/java/app/organicmaps/sdk/routing/PedestrianTurnDirection.java

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

android/app/src/main/java/app/organicmaps/sdk/routing/TransitStepType.java

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

android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java

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

android/build.gradle

@@ -26,7 +26,3 @@ rootProject.ext {
     versionCode = ver.V1
     versionName = ver.V2
 }
-
-tasks.withType(JavaCompile).configureEach {
-    options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation'
-}

android/sdk/build.gradle

@@ -115,3 +115,7 @@ project.afterEvaluate {
     }
   }
 }
+
+tasks.withType(JavaCompile).configureEach {
+  options.compilerArgs << '-Xlint:unchecked' << '-Xlint:deprecation'
+}