[android] #3008 - upgrade android grade plugin to 1.5.0
[android] #2386 - Add vector drawable and rippleDrawable for attribution icon [android] #2736 - Replace bitmap assets with vector drawable
|
Before Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 1.4 KiB |
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:color="?android:colorControlHighlight">
|
||||
<item android:id="@android:id/mask">
|
||||
<shape android:shape="oval">
|
||||
<solid android:color="@android:color/white" />
|
||||
</shape>
|
||||
</item>
|
||||
</ripple>
|
||||
|
Before Width: | Height: | Size: 2.6 KiB |
|
Before Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 4.1 KiB |
|
Before Width: | Height: | Size: 730 B |
|
Before Width: | Height: | Size: 836 B |
@@ -1,5 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/attribution_button_pressed" android:state_pressed="true" />
|
||||
<item android:drawable="@drawable/attribution_button_normal" />
|
||||
</selector>
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@color/gray_light" android:state_pressed="true" />
|
||||
<item android:drawable="@color/gray_light" android:state_focused="true" />
|
||||
<item android:drawable="@android:color/transparent" />
|
||||
</selector>
|
||||
@@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24.0"
|
||||
android:viewportHeight="24.0">
|
||||
<path
|
||||
android:fillColor="#FF1E8CAB"
|
||||
android:pathData="M11,17h2v-6h-2v6zm1,-15C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm0,18c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2V7h-2v2z"/>
|
||||
</vector>
|
||||
@@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportHeight="24.0"
|
||||
android:viewportWidth="24.0">
|
||||
<path
|
||||
android:fillColor="#551E8CAB"
|
||||
android:pathData="M11,17h2v-6h-2v6zm1,-15C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zm0,18c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2V7h-2v2z" />
|
||||
</vector>
|
||||
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/ic_info_outline_24dp_selected" android:state_pressed="true" />
|
||||
<item android:drawable="@drawable/ic_info_outline_24dp" />
|
||||
</selector>
|
||||
@@ -26,7 +26,8 @@
|
||||
android:clickable="true"
|
||||
android:contentDescription="@string/attributionsIconContentDescription"
|
||||
android:padding="7dp"
|
||||
android:src="@drawable/attribution_button_selector" />
|
||||
android:src="@drawable/ic_info_outline_24dp_selector"
|
||||
android:background="@drawable/bg_default_selector"/>
|
||||
|
||||
<com.mapbox.mapboxsdk.views.UserLocationView
|
||||
android:id="@+id/userLocationView"
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
<color name="white">#FFFFFF</color>
|
||||
<color name="black">#000000</color>
|
||||
<color name="gray">#7D7F80</color>
|
||||
<color name="gray_light">#EEEEEE</color>
|
||||
<color name="mapbox_blue">#1E8CAB</color>
|
||||
<color name="my_location_ring">@color/mapbox_blue</color>
|
||||
</resources>
|
||||
|
||||
@@ -17,7 +17,6 @@ import com.mapbox.mapboxsdk.annotations.Marker;
|
||||
import com.mapbox.mapboxsdk.annotations.MarkerOptions;
|
||||
import com.mapbox.mapboxsdk.annotations.Sprite;
|
||||
import com.mapbox.mapboxsdk.annotations.SpriteFactory;
|
||||
import com.mapbox.mapboxsdk.constants.Style;
|
||||
import com.mapbox.mapboxsdk.geometry.LatLng;
|
||||
import com.mapbox.mapboxsdk.utils.ApiAccess;
|
||||
import com.mapbox.mapboxsdk.views.MapView;
|
||||
@@ -47,7 +46,7 @@ public class InfoWindowAdapterActivity extends AppCompatActivity {
|
||||
mMapView.onCreate(savedInstanceState);
|
||||
|
||||
mSpriteFactory = new SpriteFactory(mMapView);
|
||||
mIconDrawable = ContextCompat.getDrawable(this, R.drawable.ic_location_city_black_48dp);
|
||||
mIconDrawable = ContextCompat.getDrawable(this, R.drawable.ic_location_city_24dp);
|
||||
|
||||
mMapView.setInfoWindowAdapter(new MapView.InfoWindowAdapter() {
|
||||
|
||||
|
||||
@@ -101,7 +101,7 @@ public class MainActivity extends AppCompatActivity {
|
||||
|
||||
final ActionBar ab = getSupportActionBar();
|
||||
if (ab != null) {
|
||||
ab.setHomeAsUpIndicator(R.drawable.ic_menu);
|
||||
ab.setHomeAsUpIndicator(R.drawable.ic_menu_24dp);
|
||||
ab.setDisplayHomeAsUpEnabled(true);
|
||||
}
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 124 B |
|
Before Width: | Height: | Size: 280 B |
|
Before Width: | Height: | Size: 267 B |
|
Before Width: | Height: | Size: 188 B |
|
Before Width: | Height: | Size: 161 B |
|
Before Width: | Height: | Size: 251 B |
|
Before Width: | Height: | Size: 199 B |
|
Before Width: | Height: | Size: 224 B |
|
Before Width: | Height: | Size: 215 B |
|
Before Width: | Height: | Size: 546 B |
|
Before Width: | Height: | Size: 172 B |
|
Before Width: | Height: | Size: 116 B |
|
Before Width: | Height: | Size: 549 B |
|
Before Width: | Height: | Size: 341 B |
|
Before Width: | Height: | Size: 330 B |
|
Before Width: | Height: | Size: 371 B |
|
Before Width: | Height: | Size: 227 B |
|
Before Width: | Height: | Size: 164 B |
|
Before Width: | Height: | Size: 86 B |
|
Before Width: | Height: | Size: 176 B |
|
Before Width: | Height: | Size: 207 B |
|
Before Width: | Height: | Size: 119 B |
|
Before Width: | Height: | Size: 115 B |
|
Before Width: | Height: | Size: 174 B |
|
Before Width: | Height: | Size: 132 B |
|
Before Width: | Height: | Size: 136 B |
|
Before Width: | Height: | Size: 135 B |
|
Before Width: | Height: | Size: 350 B |
|
Before Width: | Height: | Size: 147 B |
|
Before Width: | Height: | Size: 99 B |
|
Before Width: | Height: | Size: 341 B |
|
Before Width: | Height: | Size: 250 B |
|
Before Width: | Height: | Size: 233 B |
|
Before Width: | Height: | Size: 265 B |
|
Before Width: | Height: | Size: 179 B |
|
Before Width: | Height: | Size: 175 B |
|
Before Width: | Height: | Size: 108 B |
|
Before Width: | Height: | Size: 260 B |
|
Before Width: | Height: | Size: 303 B |
|
Before Width: | Height: | Size: 155 B |
|
Before Width: | Height: | Size: 151 B |
|
Before Width: | Height: | Size: 270 B |
|
Before Width: | Height: | Size: 191 B |
|
Before Width: | Height: | Size: 201 B |
|
Before Width: | Height: | Size: 190 B |
|
Before Width: | Height: | Size: 687 B |
|
Before Width: | Height: | Size: 190 B |
|
Before Width: | Height: | Size: 135 B |
|
Before Width: | Height: | Size: 660 B |
|
Before Width: | Height: | Size: 434 B |
|
Before Width: | Height: | Size: 417 B |
|
Before Width: | Height: | Size: 456 B |
|
Before Width: | Height: | Size: 243 B |
|
Before Width: | Height: | Size: 249 B |
|
Before Width: | Height: | Size: 114 B |
|
Before Width: | Height: | Size: 365 B |
|
Before Width: | Height: | Size: 445 B |
|
Before Width: | Height: | Size: 198 B |
|
Before Width: | Height: | Size: 194 B |
|
Before Width: | Height: | Size: 384 B |
|
Before Width: | Height: | Size: 256 B |
|
Before Width: | Height: | Size: 279 B |
|
Before Width: | Height: | Size: 263 B |
|
Before Width: | Height: | Size: 1012 B |
|
Before Width: | Height: | Size: 230 B |
|
Before Width: | Height: | Size: 183 B |
|
Before Width: | Height: | Size: 976 B |
|
Before Width: | Height: | Size: 607 B |
|
Before Width: | Height: | Size: 584 B |
|
Before Width: | Height: | Size: 675 B |
|
Before Width: | Height: | Size: 367 B |
|
Before Width: | Height: | Size: 300 B |
|
Before Width: | Height: | Size: 119 B |
|
Before Width: | Height: | Size: 450 B |
|
Before Width: | Height: | Size: 566 B |
|
Before Width: | Height: | Size: 252 B |
|
Before Width: | Height: | Size: 243 B |
|
Before Width: | Height: | Size: 497 B |
|
Before Width: | Height: | Size: 329 B |
|
Before Width: | Height: | Size: 343 B |