[android] clean up resources
Signed-off-by: Arnaud Vergnet <arnaud.vergnet@mailo.com>
Arnaud Vergnet
|
Before Width: | Height: | Size: 886 B |
|
Before Width: | Height: | Size: 862 B |
|
Before Width: | Height: | Size: 860 B |
|
Before Width: | Height: | Size: 832 B |
|
Before Width: | Height: | Size: 364 B |
|
Before Width: | Height: | Size: 334 B |
|
Before Width: | Height: | Size: 386 B |
|
Before Width: | Height: | Size: 418 B |
|
Before Width: | Height: | Size: 146 B |
|
Before Width: | Height: | Size: 98 B |
|
Before Width: | Height: | Size: 540 B |
|
Before Width: | Height: | Size: 502 B |
|
Before Width: | Height: | Size: 512 B |
|
Before Width: | Height: | Size: 506 B |
|
Before Width: | Height: | Size: 266 B |
|
Before Width: | Height: | Size: 226 B |
|
Before Width: | Height: | Size: 280 B |
|
Before Width: | Height: | Size: 306 B |
|
Before Width: | Height: | Size: 122 B |
|
Before Width: | Height: | Size: 82 B |
|
Before Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 470 B |
|
Before Width: | Height: | Size: 438 B |
|
Before Width: | Height: | Size: 492 B |
|
Before Width: | Height: | Size: 526 B |
|
Before Width: | Height: | Size: 130 B |
|
Before Width: | Height: | Size: 92 B |
|
Before Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 1.9 KiB |
|
Before Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 1.8 KiB |
|
Before Width: | Height: | Size: 676 B |
|
Before Width: | Height: | Size: 644 B |
|
Before Width: | Height: | Size: 702 B |
|
Before Width: | Height: | Size: 742 B |
|
Before Width: | Height: | Size: 192 B |
|
Before Width: | Height: | Size: 124 B |
|
Before Width: | Height: | Size: 874 B |
|
Before Width: | Height: | Size: 850 B |
|
Before Width: | Height: | Size: 894 B |
|
Before Width: | Height: | Size: 960 B |
7
android/res/drawable/bg_circle.xml
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
<vector android:height="24dp" android:viewportHeight="50.8"
|
||||
android:viewportWidth="50.8" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillAlpha="0.6" android:fillColor="#ffffff"
|
||||
android:pathData="M25.4,25.4m-18.885,0a18.885,18.885 0,1 1,37.77 0a18.885,18.885 0,1 1,-37.77 0"
|
||||
android:strokeColor="#dbdbdb" android:strokeLineCap="round"
|
||||
android:strokeLineJoin="bevel" android:strokeWidth="0.5"/>
|
||||
</vector>
|
||||
7
android/res/drawable/bg_circle_night.xml
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
<vector android:height="24dp" android:viewportHeight="50.8"
|
||||
android:viewportWidth="50.8" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillAlpha="0.6" android:fillColor="#3b4045"
|
||||
android:pathData="M25.4,25.4m-18.885,0a18.885,18.885 0,1 1,37.77 0a18.885,18.885 0,1 1,-37.77 0"
|
||||
android:strokeColor="#3b4045" android:strokeLineCap="round"
|
||||
android:strokeLineJoin="bevel" android:strokeWidth="0.5"/>
|
||||
</vector>
|
||||
7
android/res/drawable/bg_circle_pressed.xml
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
<vector android:height="24dp" android:viewportHeight="50.8"
|
||||
android:viewportWidth="50.8" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillAlpha="0.32156864" android:fillColor="#ffffff"
|
||||
android:pathData="M25.4,25.4m-18.885,0a18.885,18.885 0,1 1,37.77 0a18.885,18.885 0,1 1,-37.77 0"
|
||||
android:strokeColor="#dbdbdb" android:strokeLineCap="round"
|
||||
android:strokeLineJoin="bevel" android:strokeWidth="0.5"/>
|
||||
</vector>
|
||||
7
android/res/drawable/bg_circle_pressed_night.xml
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
<vector android:height="24dp" android:viewportHeight="50.8"
|
||||
android:viewportWidth="50.8" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillAlpha="0.3" android:fillColor="#3b4045"
|
||||
android:pathData="M25.4,25.4m-18.885,0a18.885,18.885 0,1 1,37.77 0a18.885,18.885 0,1 1,-37.77 0"
|
||||
android:strokeColor="#3b4045" android:strokeLineCap="round"
|
||||
android:strokeLineJoin="bevel" android:strokeWidth="0.5"/>
|
||||
</vector>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/bg_iso_lines_light_pressed" android:state_pressed="true"/>
|
||||
<item android:drawable="@drawable/bg_iso_lines_light_selected" android:state_selected="true"/>
|
||||
<item android:drawable="@drawable/bg_iso_lines_light_default"/>
|
||||
</selector>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/bg_circle"/>
|
||||
<item
|
||||
android:drawable="@drawable/ic_layers_light_on"
|
||||
android:left="@dimen/margin_base_plus_quarter"
|
||||
android:right="@dimen/margin_base_plus_quarter"
|
||||
android:top="@dimen/margin_base_plus_quarter"
|
||||
android:bottom="@dimen/margin_base_plus_quarter"/>
|
||||
</layer-list>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/bg_circle_pressed"/>
|
||||
<item
|
||||
android:drawable="@drawable/ic_layers_light_on"
|
||||
android:left="@dimen/margin_base_plus_quarter"
|
||||
android:right="@dimen/margin_base_plus_quarter"
|
||||
android:top="@dimen/margin_base_plus_quarter"
|
||||
android:bottom="@dimen/margin_base_plus_quarter"/>
|
||||
</layer-list>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/bg_circle"/>
|
||||
<item
|
||||
android:drawable="@drawable/ic_layers_off"
|
||||
android:left="@dimen/margin_base_plus_quarter"
|
||||
android:right="@dimen/margin_base_plus_quarter"
|
||||
android:top="@dimen/margin_base_plus_quarter"
|
||||
android:bottom="@dimen/margin_base_plus_quarter"/>
|
||||
</layer-list>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/bg_iso_lines_night_pressed" android:state_pressed="true"/>
|
||||
<item android:drawable="@drawable/bg_iso_lines_night_selected" android:state_selected="true"/>
|
||||
<item android:drawable="@drawable/bg_iso_lines_night_default"/>
|
||||
</selector>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/bg_circle_night"/>
|
||||
<item
|
||||
android:drawable="@drawable/ic_planning_route_isomaps_dark_on"
|
||||
android:left="@dimen/margin_base_plus_quarter"
|
||||
android:right="@dimen/margin_base_plus_quarter"
|
||||
android:top="@dimen/margin_base_plus_quarter"
|
||||
android:bottom="@dimen/margin_base_plus_quarter"/>
|
||||
</layer-list>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/bg_circle_pressed_night"/>
|
||||
<item
|
||||
android:drawable="@drawable/ic_layers_dark_on"
|
||||
android:left="@dimen/margin_base_plus_quarter"
|
||||
android:right="@dimen/margin_base_plus_quarter"
|
||||
android:top="@dimen/margin_base_plus_quarter"
|
||||
android:bottom="@dimen/margin_base_plus_quarter"/>
|
||||
</layer-list>
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item
|
||||
android:drawable="@drawable/bg_circle_night"/>
|
||||
<item
|
||||
android:drawable="@drawable/ic_layers_off_night"
|
||||
android:left="@dimen/margin_base_plus_quarter"
|
||||
android:right="@dimen/margin_base_plus_quarter"
|
||||
android:top="@dimen/margin_base_plus_quarter"
|
||||
android:bottom="@dimen/margin_base_plus_quarter"/>
|
||||
</layer-list>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/bg_subway_light_pressed" android:state_pressed="true"/>
|
||||
<item android:drawable="@drawable/bg_subway_light_selected" android:state_selected="true"/>
|
||||
<item android:drawable="@drawable/bg_subway_light_default"/>
|
||||
</selector>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/bg_circle"/>
|
||||
<item
|
||||
android:drawable="@drawable/ic_layers_light_on"
|
||||
android:left="@dimen/margin_base_plus_quarter"
|
||||
android:right="@dimen/margin_base_plus_quarter"
|
||||
android:top="@dimen/margin_base_plus_quarter"
|
||||
android:bottom="@dimen/margin_base_plus_quarter"/>
|
||||
</layer-list>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/bg_circle_pressed"/>
|
||||
<item
|
||||
android:drawable="@drawable/ic_layers_light_on"
|
||||
android:left="@dimen/margin_base_plus_quarter"
|
||||
android:right="@dimen/margin_base_plus_quarter"
|
||||
android:top="@dimen/margin_base_plus_quarter"
|
||||
android:bottom="@dimen/margin_base_plus_quarter"/>
|
||||
</layer-list>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/bg_circle"/>
|
||||
<item
|
||||
android:drawable="@drawable/ic_layers_off"
|
||||
android:left="@dimen/margin_base_plus_quarter"
|
||||
android:right="@dimen/margin_base_plus_quarter"
|
||||
android:top="@dimen/margin_base_plus_quarter"
|
||||
android:bottom="@dimen/margin_base_plus_quarter"/>
|
||||
</layer-list>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/bg_subway_night_pressed" android:state_pressed="true"/>
|
||||
<item android:drawable="@drawable/bg_subway_night_selected" android:state_selected="true"/>
|
||||
<item android:drawable="@drawable/bg_subway_night_default"/>
|
||||
</selector>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/bg_circle_night"/>
|
||||
<item
|
||||
android:drawable="@drawable/ic_layers_dark_on"
|
||||
android:left="@dimen/margin_base_plus_quarter"
|
||||
android:right="@dimen/margin_base_plus_quarter"
|
||||
android:top="@dimen/margin_base_plus_quarter"
|
||||
android:bottom="@dimen/margin_base_plus_quarter"/>
|
||||
</layer-list>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:drawable="@drawable/bg_circle_pressed_night"/>
|
||||
<item
|
||||
android:drawable="@drawable/ic_layers_dark_on"
|
||||
android:left="@dimen/margin_base_plus_quarter"
|
||||
android:right="@dimen/margin_base_plus_quarter"
|
||||
android:top="@dimen/margin_base_plus_quarter"
|
||||
android:bottom="@dimen/margin_base_plus_quarter"/>
|
||||
</layer-list>
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item
|
||||
android:drawable="@drawable/bg_circle_night"/>
|
||||
<item
|
||||
android:drawable="@drawable/ic_layers_off_night"
|
||||
android:left="@dimen/margin_base_plus_quarter"
|
||||
android:right="@dimen/margin_base_plus_quarter"
|
||||
android:top="@dimen/margin_base_plus_quarter"
|
||||
android:bottom="@dimen/margin_base_plus_quarter"/>
|
||||
</layer-list>
|
||||
5
android/res/drawable/ic_minus.xml
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
<vector android:height="24dp" android:tint="#FFFFFF"
|
||||
android:viewportHeight="24" android:viewportWidth="24"
|
||||
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="@android:color/white" android:pathData="M19,13H5v-2h14v2z"/>
|
||||
</vector>
|
||||
|
|
@ -40,13 +40,13 @@
|
|||
<ImageButton
|
||||
android:id="@+id/nav_zoom_in"
|
||||
style="@style/MwmWidget.MapButton"
|
||||
android:src="@drawable/ic_zoom_in"
|
||||
android:src="@drawable/ic_plus"
|
||||
app:layout_constraintBottom_toTopOf="@+id/nav_zoom_out"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
<ImageButton
|
||||
android:id="@+id/nav_zoom_out"
|
||||
style="@style/MwmWidget.MapButton"
|
||||
android:src="@drawable/ic_zoom_out"
|
||||
android:src="@drawable/ic_minus"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
|
|
|||
|
|
@ -41,13 +41,13 @@
|
|||
<ImageButton
|
||||
android:id="@+id/nav_zoom_in"
|
||||
style="@style/MwmWidget.MapButton"
|
||||
android:src="@drawable/ic_zoom_in"
|
||||
android:src="@drawable/ic_plus"
|
||||
app:layout_constraintBottom_toTopOf="@+id/nav_zoom_out"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
<ImageButton
|
||||
android:id="@+id/nav_zoom_out"
|
||||
style="@style/MwmWidget.MapButton"
|
||||
android:src="@drawable/ic_zoom_out"
|
||||
android:src="@drawable/ic_minus"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
|
|
|||
|
|
@ -86,8 +86,6 @@
|
|||
</declare-styleable>
|
||||
<declare-styleable name="ThemeAttrs.NavButtons">
|
||||
<attr name="nav_background" format="reference" />
|
||||
<attr name="nav_bg_subway" format="reference" />
|
||||
<attr name="nav_bg_isolines" format="reference" />
|
||||
</declare-styleable>
|
||||
<declare-styleable name="ThemeAttrs.Downloader">
|
||||
<attr name="status_done" format="reference" />
|
||||
|
|
|
|||
|
|
@ -112,8 +112,6 @@
|
|||
<item name="transitStepDivider">@drawable/dot_divider</item>
|
||||
<item name="filterPropertyBackground">@drawable/button_with_border</item>
|
||||
<item name="saleIcon">@drawable/ic_deal_light</item>
|
||||
<item name="nav_bg_subway">@drawable/bg_subway_light</item>
|
||||
<item name="nav_bg_isolines">@drawable/bg_iso_lines_light</item>
|
||||
<item name="trafficMenuEnabled">@drawable/ic_layers_traffic_active</item>
|
||||
<item name="subwayMenuEnabled">@drawable/ic_layers_subway_active</item>
|
||||
<item name="isoLinesMenuEnabled">@drawable/ic_layers_isoline_active</item>
|
||||
|
|
@ -292,8 +290,6 @@
|
|||
<item name="subwayMenuEnabled">@drawable/ic_layers_subway_active_night</item>
|
||||
<item name="isoLinesMenuEnabled">@drawable/ic_layers_isoline_active_night</item>
|
||||
<item name="saleIcon">@drawable/ic_deal_dark</item>
|
||||
<item name="nav_bg_subway">@drawable/bg_subway_night</item>
|
||||
<item name="nav_bg_isolines">@drawable/bg_iso_lines_night</item>
|
||||
<item name="accentColorSelector">@color/accent_color_selector_night</item>
|
||||
<item name="tipsBgColor">@color/tips_and_triks_bg</item>
|
||||
<item name="tipsPrimaryTextColor">@color/tips_and_triks_primary_text_night</item>
|
||||
|
|
|
|||
|
|
@ -42,8 +42,8 @@ public class TrafficButton
|
|||
void turnOff()
|
||||
{
|
||||
stopWaitingAnimation();
|
||||
mButton.setImageResource(ThemeUtils.isNightTheme(mButton.getContext()) ? R.drawable.bg_subway_night_default
|
||||
: R.drawable.bg_subway_light_default);
|
||||
mButton.setImageResource(ThemeUtils.isNightTheme(mButton.getContext()) ? R.drawable.ic_traffic_on_night
|
||||
: R.drawable.ic_traffic_on);
|
||||
}
|
||||
|
||||
void turnOn()
|
||||
|
|
|
|||