Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix merge

Browse source
This commit is contained in:
Dima-1 2020-05-14 15:42:02 +03:00
parent 4e2847a4c7
commit fd2a7bf715
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/res/layout/favorites_list_item.xml
View file

@ -2,7 +2,6 @@
<LinearLayout <LinearLayout
xmlns:osmand="http://schemas.android.com/apk/res-auto" xmlns:osmand="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:osmand="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

8
OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
View file

@ -3,6 +3,7 @@ package net.osmand.plus.activities;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.graphics.PorterDuff;
import android.graphics.Typeface; import android.graphics.Typeface;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.AsyncTask; import android.os.AsyncTask;
@ -134,13 +135,6 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
setAdapter(favouritesAdapter); setAdapter(favouritesAdapter);
boolean light = getMyApplication().getSettings().isLightContent(); boolean light = getMyApplication().getSettings().isLightContent();
arrowImage = AppCompatResources.getDrawable(context, R.drawable.ic_direction_arrow);
arrowImage.mutate();
if (light) {
arrowImage.setColorFilter(ContextCompat.getColor(context, R.color.color_distance), PorterDuff.Mode.MULTIPLY);
} else {
arrowImage.setColorFilter(ContextCompat.getColor(context, R.color.color_distance), PorterDuff.Mode.MULTIPLY);
}
arrowImageDisabled = AppCompatResources.getDrawable(context, R.drawable.ic_direction_arrow); arrowImageDisabled = AppCompatResources.getDrawable(context, R.drawable.ic_direction_arrow);
arrowImageDisabled.mutate(); arrowImageDisabled.mutate();
arrowImageDisabled.setColorFilter(ContextCompat.getColor( arrowImageDisabled.setColorFilter(ContextCompat.getColor(