pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Removed unused resources

Browse source 
As API 21 is our minimum, there is no need to override it anymore

Co-authored-by: Roman Tsisyk <roman@tsisyk.com>
Signed-off-by: Alexander Borsuk <me@alex.bio>
Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
This commit is contained in:
Alexander Borsuk 2022-10-16 08:47:48 +03:00 • committed by Roman Tsisyk
parent e62cfd40e5
commit 059ba40b07
28 changed files with 69 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
android/res/color-v21/button.xml → android/res/color/button.xml
View file

0
android/res/color-v21/button_accent.xml → android/res/color/button_accent.xml
View file

0
android/res/color-v21/button_accent_night.xml → android/res/color/button_accent_night.xml
View file

0
android/res/color-v21/button_night.xml → android/res/color/button_night.xml
View file

10
android/res/drawable-v21/button.xml
View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorBtnHighlight">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
<solid android:color="@android:color/white"/>
<corners android:radius="2dp"/>
</shape>
</item>
</ripple>

7
android/res/drawable-v21/button_accent.xml
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorBtnHighlight">
<item android:drawable="@drawable/ripple_mask"/>
<item android:drawable="@drawable/button_accent_internal"/>
</ripple>

7
android/res/drawable-v21/button_accent_night.xml
View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorBtnHighlight">
<item android:drawable="@drawable/ripple_mask"/>
<item android:drawable="@drawable/button_accent_night_internal"/>
</ripple>

11
android/res/drawable-v21/button_editor_light.xml
View file

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/bg_editor_light_pressed">
<item>
<shape android:shape="rectangle">
<solid android:color="@color/bg_editor_light"/>
<corners android:radius="2dp"/>
</shape>
</item>
</ripple>

10
android/res/drawable-v21/button_night.xml
View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/button_pressed_night">
<item>
<shape android:shape="rectangle">
<solid android:color="@color/button_night"/>
<corners android:radius="2dp"/>
</shape>
</item>
</ripple>

10
android/res/drawable-v21/button_red.xml
View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/button_pressed">
<item>
<shape android:shape="rectangle">
<solid android:color="@color/button_red"/>
<corners android:radius="2dp"/>
</shape>
</item>
</ripple>

13
android/res/drawable-v21/routing_toolbar_button.xml
View file

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorControlHighlight">
<item>
<selector>
<item
android:state_activated="true"
android:drawable="@drawable/routing_toolbar_button_active"/>
<item
android:drawable="@drawable/routing_toolbar_button_normal"/>
</selector>
</item>
</ripple>

13
android/res/drawable-v21/routing_toolbar_button_night.xml
View file

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorControlHighlight">
<item>
<selector>
<item
android:state_activated="true"
android:drawable="@drawable/routing_toolbar_button_active"/>
<item
android:drawable="@drawable/routing_toolbar_button_normal_night"/>
</selector>
</item>
</ripple>

18
android/res/drawable/button.xml
View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/button_pressed"
android:state_pressed="true"/>
<item android:drawable="@drawable/button_normal"
android:state_enabled="true"/>
<item android:drawable="@drawable/button_disabled"/>
</selector>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorBtnHighlight">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
<solid android:color="@android:color/white"/>
<corners android:radius="2dp"/>
</shape>
</item>
</ripple>

8
android/res/drawable/button_accent.xml
View file

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android="http://schemas.android.com/apk/res/android">
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorBtnHighlight">
<item android:drawable="@drawable/ripple_mask"/>
<item android:drawable="@drawable/button_accent_internal"/>
</layer-list>
</ripple>

8
android/res/drawable/button_accent_night.xml
View file

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android="http://schemas.android.com/apk/res/android">
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorBtnHighlight">
<item android:drawable="@drawable/ripple_mask"/>
<item android:drawable="@drawable/button_accent_night_internal"/>
</layer-list>
</ripple>

17
android/res/drawable/button_editor_light.xml
View file

@ -1,18 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape android:shape="rectangle">
<solid android:color="@color/bg_editor_light_pressed"/>
<corners android:radius="2dp"/>
</shape>
</item>
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/bg_editor_light_pressed">
<item>
<shape
android:shape="rectangle">
<shape android:shape="rectangle">
<solid android:color="@color/bg_editor_light"/>
<corners android:radius="2dp"/>
</shape>
</item>
</selector>
</ripple>

18
android/res/drawable/button_night.xml
View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/button_pressed_night"
android:state_pressed="true"/>
<item android:drawable="@drawable/button_normal_night"
android:state_enabled="true"/>
<item android:drawable="@drawable/button_disabled_night"/>
</selector>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/button_pressed_night">
<item>
<shape android:shape="rectangle">
<solid android:color="@color/button_night"/>
<corners android:radius="2dp"/>
</shape>
</item>
</ripple>

18
android/res/drawable/button_red.xml
View file

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/button_red_pressed"
android:state_pressed="true"/>
<item android:drawable="@drawable/button_red_normal"
android:state_enabled="true"/>
<item android:drawable="@drawable/button_red_disabled"/>
</selector>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/button_pressed">
<item>
<shape android:shape="rectangle">
<solid android:color="@color/button_red"/>
<corners android:radius="2dp"/>
</shape>
</item>
</ripple>

0
android/res/drawable-v21/ripple_mask.xml → android/res/drawable/ripple_mask.xml
View file

20
android/res/drawable/routing_toolbar_button.xml
View file

@ -1,9 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_activated="true"
android:drawable="@drawable/routing_toolbar_button_active"/>
<item
android:drawable="@drawable/routing_toolbar_button_normal"/>
</selector>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorControlHighlight">
<item>
<selector>
<item
android:state_activated="true"
android:drawable="@drawable/routing_toolbar_button_active"/>
<item
android:drawable="@drawable/routing_toolbar_button_normal"/>
</selector>
</item>
</ripple>

20
android/res/drawable/routing_toolbar_button_night.xml
View file

@ -1,9 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_activated="true"
android:drawable="@drawable/routing_toolbar_button_active"/>
<item
android:drawable="@drawable/routing_toolbar_button_normal_night"/>
</selector>
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?attr/colorControlHighlight">
<item>
<selector>
<item
android:state_activated="true"
android:drawable="@drawable/routing_toolbar_button_active"/>
<item
android:drawable="@drawable/routing_toolbar_button_normal_night"/>
</selector>
</item>
</ripple>

1
android/res/layout/activity_splash.xml
View file

@ -20,7 +20,6 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:paddingBottom="@dimen/margin_double">
<TextView

0
android/res/values-sw360dp-v13/values-preference.xml → android/res/values-sw360dp/values-preference.xml
View file

4
android/res/values-v21/donottranslate.xml
View file

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="robotoMedium" translatable="false">sans-serif-medium</string>
</resources>

4
android/res/values/colors.xml
View file

@ -85,8 +85,6 @@
<color name="bg_statusbar_night">#121417</color>
<!-- Buttons -->
<color name="button">@color/button_normal</color>
<color name="button_night">@color/button_normal_night</color>
<color name="button_normal">#00000000</color>
<color name="button_normal_night">#00000000</color>
<color name="button_pressed">#66999999</color>
@ -98,8 +96,6 @@
<color name="button_text_disabled">#42000000</color>
<color name="button_text_disabled_night">#4CFFFFFF</color>
<color name="button_accent">@color/button_accent_normal</color>
<color name="button_accent_night">@color/button_accent_normal_night</color>
<color name="button_accent_normal">@color/base_accent</color>
<color name="button_accent_normal_night">@color/base_accent_night</color>
<color name="button_accent_pressed">#FF1C85D6</color>

3
android/res/values/donottranslate.xml
View file

@ -3,8 +3,7 @@
<!-- Font names -->
<string name="robotoLight" translatable="false">sans-serif-light</string>
<string name="robotoRegular" translatable="false">sans-serif</string>
<!-- roboto medium (android 5.0)-->
<string name="robotoMedium" translatable="false">sans-serif</string>
<string name="robotoMedium" translatable="false">sans-serif-medium</string>
<!-- Prefs -->
<string name="pref_munits" translatable="false">MeasurementUnits</string>

5
android/src/com/mapswithme/maps/routing/BaseRoutingErrorDialogFragment.java
View file

@ -141,10 +141,7 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment
final int width = listView.getWidth();
final int indicatorWidth = UiUtils.dimen(requireContext(), R.dimen.margin_quadruple);
listView.setIndicatorBounds(width - indicatorWidth, width);
if (Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN_MR2)
listView.setIndicatorBounds(width - indicatorWidth, width);
else
listView.setIndicatorBoundsRelative(width - indicatorWidth, width);
listView.setIndicatorBoundsRelative(width - indicatorWidth, width);
}
});

11
android/src/com/mapswithme/util/HttpUploader.java
View file

@ -120,16 +120,7 @@ public final class HttpUploader extends AbstractHttpUploader
private static void setStreamingMode(@NonNull HttpURLConnection connection, long bodyLength)
{
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
{
connection.setFixedLengthStreamingMode(bodyLength);
return;
}
if (bodyLength <= Integer.MAX_VALUE)
connection.setFixedLengthStreamingMode((int) bodyLength);
else
connection.setChunkedStreamingMode(BUFFER);
connection.setFixedLengthStreamingMode(bodyLength);
}
@NonNull